i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/arch/arm: fix build - comment out fdt stuff as it's completely broken now

Browse Source 
Change-Id: I8c0c5da0a915969176afea9e0e2cc2f831a18d59
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4619
Reviewed-by: Alex von Gluck IV <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
David Karoly
2021-10-21 09:09:24 +00:00
committed by Adrien Destugues
parent d37e23576c
commit d5bac4fd07
7 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/arm/arch_int.cpp
+6 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2012, Haiku Inc. All rights reserved.
* Copyright 2003-2021, Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -54,7 +54,7 @@ static area_id sVectorPageArea;
static void *sVectorPageAddress;
static area_id sUserVectorPageArea;
static void *sUserVectorPageAddress;
static fdt_module_info *sFdtModule;
//static fdt_module_info *sFdtModule;
// An iframe stack used in the early boot process when we don't have
// threads yet.
@@ -116,6 +116,7 @@ arch_int_init(kernel_args *args)
extern "C" void arm_vector_init(void);
#if 0
static struct fdt_device_info intc_table[] = {
{
.compatible = "marvell,pxa-intc",
@@ -126,6 +127,7 @@ static struct fdt_device_info intc_table[] = {
}
};
static int intc_count = sizeof(intc_table) / sizeof(struct fdt_device_info);
#endif
status_t
@@ -165,6 +167,7 @@ arch_int_init_post_vm(kernel_args *args)
dprintf("Enabled high vectors\n");
}
#if 0
status_t rc = get_module(B_FDT_MODULE_NAME, (module_info**)&sFdtModule);
if (rc != B_OK)
panic("Unable to get FDT module: %08lx!\n", rc);
@@ -172,6 +175,7 @@ arch_int_init_post_vm(kernel_args *args)
rc = sFdtModule->setup_devices(intc_table, intc_count, NULL);
if (rc != B_OK)
panic("No interrupt controllers found!\n");
#endif
return B_OK;
}
src/system/kernel/arch/arm/arch_timer.cpp
+6 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2007-2012, Haiku Inc. All rights reserved.
* Copyright 2007-2021, Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -32,8 +32,9 @@
# define TRACE(x) ;
#endif
static fdt_module_info *sFdtModule;
//static fdt_module_info *sFdtModule;
#if 0
static struct fdt_device_info intc_table[] = {
{
.compatible = "marvell,pxa-timers", // XXX not in FDT (also not in upstream!)
@@ -44,6 +45,7 @@ static struct fdt_device_info intc_table[] = {
}
};
static int intc_count = sizeof(intc_table) / sizeof(struct fdt_device_info);
#endif
void
@@ -68,6 +70,7 @@ arch_init_timer(kernel_args *args)
{
TRACE(("%s\n", __func__));
#if 0
status_t rc = get_module(B_FDT_MODULE_NAME, (module_info**)&sFdtModule);
if (rc != B_OK)
panic("Unable to get FDT module: %08lx!\n", rc);
@@ -75,6 +78,7 @@ arch_init_timer(kernel_args *args)
rc = sFdtModule->setup_devices(intc_table, intc_count, NULL);
if (rc != B_OK)
panic("No interrupt controllers found!\n");
#endif
return B_OK;
}
src/system/kernel/arch/arm/soc.h
+4
View File
@@ -21,6 +21,7 @@ public:
}
protected:
#if 0
InterruptController(fdt_module_info *fdtModule, fdt_device_node node)
: fFDT(fdtModule), fNode(node) {
if (sInstance) {
@@ -32,6 +33,7 @@ protected:
// Keep our node around as we might want to grab attributes from it
fdt_module_info *fFDT;
fdt_device_node fNode;
#endif
static InterruptController *sInstance;
};
@@ -50,6 +52,7 @@ public:
}
protected:
#if 0
HardwareTimer(fdt_module_info *fdtModule, fdt_device_node node)
: fFDT(fdtModule), fNode(node) {
if (sInstance) {
@@ -61,6 +64,7 @@ protected:
// Keep our node around as we might want to grab attributes from it
fdt_module_info *fFDT;
fdt_device_node fNode;
#endif
static HardwareTimer *sInstance;
};
src/system/kernel/arch/arm/soc_omap3.cpp
+4
View File
@@ -92,6 +92,7 @@ OMAP3InterruptController::SoftReset()
}
#if 0
OMAP3InterruptController::OMAP3InterruptController(fdt_module_info *fdt, fdt_device_node node)
: InterruptController(fdt, node),
fNumPending(3)
@@ -105,6 +106,7 @@ OMAP3InterruptController::OMAP3InterruptController(fdt_module_info *fdt, fdt_dev
// Enable protection (MPU registers only available in privileged mode)
fRegBase[INTCPS_PROTECTION] |= 1;
}
#endif
enum {
@@ -181,6 +183,7 @@ OMAP3Timer::Clear()
}
#if 0
OMAP3Timer::OMAP3Timer(fdt_module_info *fdtModule, fdt_device_node node)
: HardwareTimer(fdtModule, node),
fSystemTime(0)
@@ -202,3 +205,4 @@ OMAP3Timer::OMAP3Timer(fdt_module_info *fdtModule, fdt_device_node node)
install_io_interrupt_handler(fInterrupt, &OMAP3Timer::_InterruptWrapper, this, 0);
}
#endif
src/system/kernel/arch/arm/soc_omap3.h
+6 -2
View File
@@ -14,13 +14,15 @@ public:
void DisableInterrupt(int irq);
void HandleInterrupt();
#if 0
static status_t Init(fdt_module_info *fdt, fdt_device_node node, void *cookie) {
InterruptController *ic = new(std::nothrow) OMAP3InterruptController(fdt, node);
// XXX implement InitCheck() functionality
return ic != NULL ? B_OK : B_NO_MEMORY;
}
#endif
protected:
OMAP3InterruptController(fdt_module_info *fdt, fdt_device_node node);
//OMAP3InterruptController(fdt_module_info *fdt, fdt_device_node node);
void SoftReset();
@@ -35,6 +37,7 @@ public:
bigtime_t Time();
void Clear();
#if 0
static status_t Init(fdt_module_info *fdt, fdt_device_node node, void *cookie) {
if (sInstance == NULL) {
OMAP3Timer *timer = new(std::nothrow) OMAP3Timer(fdt, node);
@@ -46,9 +49,10 @@ public:
return B_OK;
}
}
#endif
private:
OMAP3Timer(fdt_module_info *fdtModule, fdt_device_node node);
//OMAP3Timer(fdt_module_info *fdtModule, fdt_device_node node);
static int32 _InterruptWrapper(void *data);
int32 HandleInterrupt();
src/system/kernel/arch/arm/soc_pxa.cpp
+4
View File
@@ -40,6 +40,7 @@ PXAInterruptController::HandleInterrupt()
}
#if 0
PXAInterruptController::PXAInterruptController(fdt_module_info *fdt, fdt_device_node node)
: InterruptController(fdt, node) {
fRegArea = fFDT->map_reg_range(node, 0, (void**)&fRegBase);
@@ -49,6 +50,7 @@ PXAInterruptController::PXAInterruptController(fdt_module_info *fdt, fdt_device_
fRegBase[PXA_ICMR] = 0;
fRegBase[PXA_ICMR2] = 0;
}
#endif
#define PXA_TIMERS_INTERRUPT 7 /* OST_4_11 */
@@ -138,6 +140,7 @@ PXATimer::HandleInterrupt()
}
#if 0
PXATimer::PXATimer(fdt_module_info *fdt, fdt_device_node node)
: HardwareTimer(fdt, node)
{
@@ -152,3 +155,4 @@ PXATimer::PXATimer(fdt_module_info *fdt, fdt_device_node node)
install_io_interrupt_handler(PXA_TIMERS_INTERRUPT, &PXATimer::_InterruptWrapper, NULL, 0);
}
#endif
src/system/kernel/arch/arm/soc_pxa.h
+6 -2
View File
@@ -14,14 +14,16 @@ public:
void DisableInterrupt(int irq);
void HandleInterrupt();
#if 0
static status_t Init(fdt_module_info *fdt, fdt_device_node node, void *cookie) {
InterruptController *ic = new(std::nothrow) PXAInterruptController(fdt, node);
// XXX implement InitCheck() functionality
return ic != NULL ? B_OK : B_NO_MEMORY;
}
#endif
protected:
PXAInterruptController(fdt_module_info *fdt, fdt_device_node node);
//PXAInterruptController(fdt_module_info *fdt, fdt_device_node node);
area_id fRegArea;
uint32 *fRegBase;
@@ -34,14 +36,16 @@ public:
void Clear();
bigtime_t Time();
#if 0
static status_t Init(fdt_module_info *fdt, fdt_device_node node, void *cookie) {
PXATimer *timer = new(std::nothrow) PXATimer(fdt, node);
// XXX implement InitCheck() functionality
return timer != NULL ? B_OK : B_NO_MEMORY;
}
#endif
protected:
PXATimer(fdt_module_info *fdt, fdt_device_node node);
//PXATimer(fdt_module_info *fdt, fdt_device_node node);
area_id fRegArea;
uint32 *fRegBase;