lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/rpi3' of github.com:littlekernel/lk into wip/rpi3

Browse Source
This commit is contained in:
Eric Holland
2016-07-15 10:28:56 -07:00
parent 62b5860502 5e10f58e8b
commit f803955e33
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/bcm28xx/platform.c
View File

@@ -128,9 +128,9 @@ void platform_early_init(void)
intc_init(); intc_init();
arm_generic_timer_init(INTERRUPT_ARM_LOCAL_CNTPNSIRQ, 1000000);
#if BCM2837 #if BCM2837
arm_generic_timer_init(INTERRUPT_ARM_LOCAL_CNTPNSIRQ, 0);
/* look for a flattened device tree just before the kernel */ /* look for a flattened device tree just before the kernel */
const void *fdt = (void *)KERNEL_BASE; const void *fdt = (void *)KERNEL_BASE;
int err = fdt_check_header(fdt); int err = fdt_check_header(fdt);
@@ -173,6 +173,10 @@ void platform_early_init(void)
} }
} }
#elif BCM2836
arm_generic_timer_init(INTERRUPT_ARM_LOCAL_CNTPNSIRQ, 1000000);
#else
#error Unknown BCM28XX Variant
#endif #endif
/* add the main memory arena */ /* add the main memory arena */