diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-30 16:16:32 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-08 02:17:32 +0300 |
| commit | 5f588f831b7459ea910aaf75f4ddd2522987b0e6 (patch) | |
| tree | ba4e04647da735f6ac5ddc547a26578d8e99855c /board/toradex | |
| parent | 87e8d38a3977ee284e1bbaad03f08d652ca1c7ec (diff) | |
| download | u-boot-5f588f831b7459ea910aaf75f4ddd2522987b0e6.tar.xz | |
arm: Finish migration of CONFIG_MACH_TYPE
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 'board/toradex')
| -rw-r--r-- | board/toradex/common/tdx-cfg-block.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index e4f9a0db91..fe47cddad8 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -493,24 +493,24 @@ static int get_cfgblock_interactive(void) else tdx_hw_tag.prodid = COLIBRI_PXA270_520MHZ; } -#ifdef CONFIG_MACH_TYPE +#if defined(CONFIG_TARGET_APALIS_T30) || defined(CONFIG_TARGET_COLIBRI_T30) else if (!strcmp("tegra30", soc)) { - if (CONFIG_MACH_TYPE == MACH_TYPE_APALIS_T30) { - if (it == 'y' || it == 'Y') - tdx_hw_tag.prodid = APALIS_T30_IT; - else - if (gd->ram_size == 0x40000000) - tdx_hw_tag.prodid = APALIS_T30_1GB; - else - tdx_hw_tag.prodid = APALIS_T30_2GB; - } else { - if (it == 'y' || it == 'Y') - tdx_hw_tag.prodid = COLIBRI_T30_IT; +#ifdef CONFIG_TARGET_APALIS_T30 + if (it == 'y' || it == 'Y') + tdx_hw_tag.prodid = APALIS_T30_IT; + else + if (gd->ram_size == 0x40000000) + tdx_hw_tag.prodid = APALIS_T30_1GB; else - tdx_hw_tag.prodid = COLIBRI_T30; - } + tdx_hw_tag.prodid = APALIS_T30_2GB; +#else + if (it == 'y' || it == 'Y') + tdx_hw_tag.prodid = COLIBRI_T30_IT; + else + tdx_hw_tag.prodid = COLIBRI_T30; +#endif } -#endif /* CONFIG_MACH_TYPE */ +#endif /* CONFIG_TARGET_APALIS_T30 || CONFIG_TARGET_COLIBRI_T30 */ else if (!strcmp("tegra124", soc)) { tdx_hw_tag.prodid = APALIS_TK1_2GB; } else if (!strcmp("vf500", soc)) { |