From af056576ea1a049b12f7cdc862138b90a3a5cd29 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 13 Mar 2015 17:43:35 -0500 Subject: [PATCH] bcm283X: Don't break all non-bcm arm builds, warn. * Called via arm_mailbox_bcm2835 *and* arm_framebuffer_bcm2835 * This is a bit messy. We really should be getting these chipset-centric bases from the provided FDT / DTB. * I can't think of a way to redo this without undoing work towards FDT. --- headers/private/kernel/arch/arm/bcm283X.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/headers/private/kernel/arch/arm/bcm283X.h b/headers/private/kernel/arch/arm/bcm283X.h index d0483e5b6a..bf5665679a 100644 --- a/headers/private/kernel/arch/arm/bcm283X.h +++ b/headers/private/kernel/arch/arm/bcm283X.h @@ -39,13 +39,20 @@ */ // Section 1.2.2 +// These board bases should go away when we start using FDT's +// (all loader drivers compiled in, drivers chosen based on FDT) +// #define BCM283X_SDRAM_BASE 0x00000000 #if defined(BOARD_CPU_BCM2835) #define BCM283X_PERIPHERAL_BASE 0x20000000 #elif defined(BOARD_CPU_BCM2836) #define BCM283X_PERIPHERAL_BASE 0x3f000000 #else -#error Unknown BCM283X! +// This will always trigger on non-BCM arm boards +// Leave in until we use FDT to pick needed board drivers at runtime. +// We can get peripheral base from the DTB long-term +#define BCM283X_PERIPHERAL_BASE 0x0 +#warning Unknown BCM283X chipset! #endif