diff options
author | Tom Rini <trini@konsulko.com> | 2017-01-25 20:42:35 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-01-28 14:04:22 -0500 |
commit | 94ba26f2bcc02013e8b7561d070d6d2eb4f091be (patch) | |
tree | 4ee512fc471b7aca012cbc1b0b6d3b965ebed152 /include/configs/rpi.h | |
parent | 539cb8038e5afde6ac217d3088dcd8817736b10c (diff) | |
download | u-boot-94ba26f2bcc02013e8b7561d070d6d2eb4f091be.tar.gz |
Revert "arm: Remove unregister MACH_TYPE_xxx uses"
This reverts commit 70b26cd057f42c7126088b49d4285955c8a00eae.
This is not a strict revert as it is easier to fix
board/atmark-techno/armadillo-800eva/armadillo-800eva.c to now the
correct name (same value) than to revert that change too.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/rpi.h')
-rw-r--r-- | include/configs/rpi.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/configs/rpi.h b/include/configs/rpi.h index c460207e64..4ba04e3179 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -24,6 +24,21 @@ (&((struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR)->clo) #endif +/* + * 2835 is a SKU in a series for which the 2708 is the first or primary SoC, + * so 2708 has historically been used rather than a dedicated 2835 ID. + * + * We don't define a machine type for bcm2709/bcm2836 since the RPi Foundation + * chose to use someone else's previously registered machine ID (3139, MX51_GGC) + * rather than obtaining a valid ID:-/ + * + * For the bcm2837, hopefully a machine type is not needed, since everything + * is DT. + */ +#ifdef CONFIG_BCM2835 +#define CONFIG_MACH_TYPE MACH_TYPE_BCM2708 +#endif + /* Memory layout */ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x00000000 |