diff options
| author | Stephen Warren <swarren@wwwdotorg.org> | 2016-03-16 21:40:56 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-27 09:12:20 -0400 |
| commit | ed7481c7d18fe2c632b6fbe5646b32cefd2dc791 (patch) | |
| tree | b3a947abe410f39ca3746791e71b173c878170bd /include/configs | |
| parent | 7ad260a999d77cec94103b97cb5f51ccc0a0abe5 (diff) | |
ARM: bcm283x: don't always define CONFIG_BCM2835
Currently, CONFIG_BCM2835 is defined for all BCM283x builds and _BCM2836
is defined when building for that SoC. That means there isn't a single
define that means "exactly BCM2835". This will complicate future patches
where BCM2835-vs-anything-else needs to be determined simply.
Modify the code to define one or the other of CONFIG_BCM2835/BCM2836 so
future patches are simpler.
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/rpi-common.h | 5 | ||||
| -rw-r--r-- | include/configs/rpi.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h index 7250e37a35..89aee0a85b 100644 --- a/include/configs/rpi-common.h +++ b/include/configs/rpi-common.h @@ -11,7 +11,6 @@ #include <asm/arch/timer.h> /* Architecture, CPU, etc.*/ -#define CONFIG_BCM2835 #define CONFIG_ARCH_CPU_INIT #define CONFIG_SYS_TIMER_RATE 1000000 @@ -26,7 +25,7 @@ * chose to use someone else's previously registered machine ID (3139, MX51_GGC) * rather than obtaining a valid ID:-/ */ -#ifndef CONFIG_BCM2836 +#ifdef CONFIG_BCM2835 #define CONFIG_MACH_TYPE MACH_TYPE_BCM2708 #endif @@ -80,7 +79,7 @@ #define CONFIG_CMD_USB #ifdef CONFIG_CMD_USB #define CONFIG_USB_DWC2 -#ifdef CONFIG_BCM2836 +#ifndef CONFIG_BCM2835 #define CONFIG_USB_DWC2_REG_ADDR 0x3f980000 #else #define CONFIG_USB_DWC2_REG_ADDR 0x20980000 diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 86422e390d..a788ce42e4 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -7,6 +7,7 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_BCM2835 #define CONFIG_SYS_CACHELINE_SIZE 32 #include "rpi-common.h" |