diff options
author | Tom Rini <trini@konsulko.com> | 2021-08-30 09:16:32 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-09-07 19:17:32 -0400 |
commit | 5f588f831b7459ea910aaf75f4ddd2522987b0e6 (patch) | |
tree | ba4e04647da735f6ac5ddc547a26578d8e99855c /include/configs/rpi.h | |
parent | 87e8d38a3977ee284e1bbaad03f08d652ca1c7ec (diff) | |
download | u-boot-5f588f831b7459ea910aaf75f4ddd2522987b0e6.tar.gz |
arm: Finish migration of CONFIG_MACH_TYPEWIP/2021-09-07-ATAGs-and-related-migration
As this is only useful when booting with ATAGs, which are now largely
disabled, remove this value for the remaining platforms. We have a few
places in the code that had been testing for MACH_TYPE as a sort of
internal logic. Update those to use different but still correct CONFIG
symbols.
Cc: Phil Sutter <phil@nwl.cc>
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, 0 insertions, 15 deletions
diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 14c89a9741..55768a46da 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -22,21 +22,6 @@ (&((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_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE |