[U-Boot] [PATCH 1/2] arm: Remove unofficial mach-type number uses
We have a number of instances of platforms that define a MACH_TYPE_xxx value and number. We are currently synced with the latest vales from the Linux Kernel and in turn if numbers are not used there it is because they were never officially used anywhere. We drop all our instances of these numbers.
Cc: Heiko Schocher hs@denx.de Cc: Yegor Yefremov yegorslists@googlemail.com Cc: Gilles Gameiro gilles@gigadevices.com Cc: Tom Warren twarren@nvidia.com Cc: Stephen Warren swarren@nvidia.com Cc: Manfred Rudigier manfred.rudigier@omicronenergy.com Cc: "Christoph Rüdisser" christoph.ruedisser@omicronenergy.com Cc: Igor Grinberg grinberg@compulab.co.il Cc: Vladimir Zapolskiy vz@mleia.com Cc: Stefan Herbrechtsmeier stefan@herbrechtsmeier.net Cc: Jason Cooper u-boot@lakedaemon.net Cc: Walter Schweizer swwa@users.sourceforge.net Cc: Ash Charles ash@gumstix.com Cc: Raphael Assenat raph@8d.com Cc: egnite GmbH info@egnite.de Cc: Stefano Babic sbabic@denx.de Cc: Ajay Bhargav contact@8051projects.net Cc: Lukasz Dalek luk0104@gmail.com Cc: Simon Guinot simon.guinot@sequanux.org Cc: Anatolij Gustschin agust@denx.de Cc: Daniel Gorsulowski daniel.gorsulowski@esd.eu Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Peng Fan peng.fan@nxp.com Cc: Evgeni Dobrev evgeni@studio-punkt.com Cc: "Albert ARIBAUD (3ADEV)" albert.aribaud@3adev.fr Cc: Ilko Iliev iliev@ronetix.at Cc: Dave Purdy david.c.purdy@gmail.com Cc: Stefan Roese sr@denx.de Cc: Jaehoon Chung jh80.chung@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com Cc: Javier Martinez Canillas javier@osg.samsung.com Cc: Sjoerd Simons sjoerd.simons@collabora.co.uk Cc: Masahiro Yamada yamada.masahiro@socionext.com Cc: Simon Glass sjg@chromium.org Cc: Jagan Teki jagan@openedev.com Cc: Lokesh Vutla lokeshvutla@ti.com Cc: Paul Kocialkowski contact@paulk.fr Signed-off-by: Tom Rini trini@konsulko.com --- board/LaCie/netspace_v2/netspace_v2.c | 2 ++ board/Marvell/gplugd/gplugd.c | 2 -- board/Seagate/nas220/nas220.c | 5 ----- board/esd/meesc/meesc.c | 9 +++------ board/gumstix/duovero/duovero.c | 1 - board/h2200/h2200.c | 2 -- board/quipos/cairo/cairo.c | 2 -- board/ronetix/pm9261/pm9261.c | 3 --- board/ronetix/pm9263/pm9263.c | 3 --- board/ronetix/pm9g45/pm9g45.c | 2 -- board/technexion/tao3530/tao3530.c | 2 -- include/configs/am335x_evm.h | 3 --- include/configs/am335x_shc.h | 19 ------------------- include/configs/baltos.h | 3 --- include/configs/bav335x.h | 3 --- include/configs/beaver.h | 3 --- include/configs/calimain.h | 2 -- include/configs/cm_t335.h | 3 --- include/configs/devkit3250.h | 6 ------ include/configs/dns325.h | 6 ------ include/configs/dreamplug.h | 14 -------------- include/configs/ds109.h | 14 -------------- include/configs/duovero.h | 2 -- include/configs/eco5pk.h | 3 --- include/configs/ethernut5.h | 4 ---- include/configs/exynos5250-common.h | 4 ---- include/configs/exynos5420-common.h | 3 --- include/configs/flea3.h | 7 ------- include/configs/gplugd.h | 11 ----------- include/configs/h2200.h | 3 --- include/configs/km/km_arm.h | 5 ----- include/configs/lacie_kw.h | 8 -------- include/configs/mcx.h | 3 --- include/configs/meesc.h | 8 -------- include/configs/mt_ventoux.h | 3 --- include/configs/mx6slevk.h | 3 --- include/configs/nas220.h | 6 ------ include/configs/omap3_cairo.h | 4 ---- include/configs/pm9261.h | 3 --- include/configs/pm9263.h | 3 --- include/configs/pm9g45.h | 3 --- include/configs/pogo_e02.h | 6 ------ include/configs/tao3530.h | 2 -- include/configs/titanium.h | 3 --- include/configs/trats.h | 6 ------ include/configs/twister.h | 4 ---- include/configs/udoo.h | 3 --- include/configs/woodburn_common.h | 7 ------- include/configs/work_92105.h | 7 ------- 49 files changed, 5 insertions(+), 228 deletions(-)
diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c index 17e629622ff7..21fff5fa7a8b 100644 --- a/board/LaCie/netspace_v2/netspace_v2.c +++ b/board/LaCie/netspace_v2/netspace_v2.c @@ -69,8 +69,10 @@ int board_early_init_f(void)
int board_init(void) { +#ifdef CONFIG_MACH_TYPE /* Machine number */ gd->bd->bi_arch_number = CONFIG_MACH_TYPE; +#endif
/* Boot parameters address */ gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100; diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c index c8c4ad2a9822..1786d14a58d2 100644 --- a/board/Marvell/gplugd/gplugd.c +++ b/board/Marvell/gplugd/gplugd.c @@ -75,8 +75,6 @@ int board_init(void) struct armd1apb2_registers *apb2_regs = (struct armd1apb2_registers *)ARMD1_APBC2_BASE;
- /* arch number of Board */ - gd->bd->bi_arch_number = MACH_TYPE_SHEEVAD; /* adress of boot parameters */ gd->bd->bi_boot_params = armd1_sdram_base(0) + 0x100; /* Assert PHY_RST# */ diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c index d9a06273a319..5e55929a8b4f 100644 --- a/board/Seagate/nas220/nas220.c +++ b/board/Seagate/nas220/nas220.c @@ -72,11 +72,6 @@ int board_early_init_f(void)
int board_init(void) { - /* - * arch number of board - */ - gd->bd->bi_arch_number = MACH_TYPE_NAS220; - /* adress of boot parameters */ gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100;
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c index fe781dcc923d..861a67914371 100644 --- a/board/esd/meesc/meesc.c +++ b/board/esd/meesc/meesc.c @@ -159,20 +159,17 @@ int checkboard(void) switch (hw_type) { case 0x11: case 0x3F: - /* ET1100 present, arch number of MEESC-Board */ - gd->bd->bi_arch_number = MACH_TYPE_MEESC; + /* ET1100 present, MEESC-Board */ puts("Board: CAN-EtherCAT Gateway"); break; case 0xFF: - /* no ET1100 present, arch number of EtherCAN/2-Board */ - gd->bd->bi_arch_number = MACH_TYPE_ETHERCAN2; + /* no ET1100 present, EtherCAN/2-Board */ puts("Board: EtherCAN/2 Gateway"); /* switch on LED1D */ at91_set_pio_output(AT91_PIO_PORTB, 12, 1); break; default: - /* assume, no ET1100 present, arch number of EtherCAN/2-Board */ - gd->bd->bi_arch_number = MACH_TYPE_ETHERCAN2; + /* assume, no ET1100 present, EtherCAN/2-Board */ printf("ERROR! Read invalid hw_type: %02X\n", hw_type); puts("Board: EtherCAN/2 Gateway"); break; diff --git a/board/gumstix/duovero/duovero.c b/board/gumstix/duovero/duovero.c index 3786842d365d..317f6b6cc558 100644 --- a/board/gumstix/duovero/duovero.c +++ b/board/gumstix/duovero/duovero.c @@ -47,7 +47,6 @@ int board_init(void) { gpmc_init();
- gd->bd->bi_arch_number = MACH_TYPE_OMAP4_DUOVERO; gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
return 0; diff --git a/board/h2200/h2200.c b/board/h2200/h2200.c index 01f8e67be145..c96c1ff0b223 100644 --- a/board/h2200/h2200.c +++ b/board/h2200/h2200.c @@ -35,8 +35,6 @@ int board_init(void) dcache_disable(); icache_disable();
- gd->bd->bi_arch_number = MACH_TYPE_H2200; - /* adress of boot parameters */ gd->bd->bi_boot_params = 0xa0000100;
diff --git a/board/quipos/cairo/cairo.c b/board/quipos/cairo/cairo.c index 793aa9023150..f820b0978f21 100644 --- a/board/quipos/cairo/cairo.c +++ b/board/quipos/cairo/cairo.c @@ -44,8 +44,6 @@ u8 omap3_evm_need_extvbus(void) int board_init(void) { gpmc_init(); /* in SRAM or SDRAM, finish GPMC */ - /* board id for Linux */ - gd->bd->bi_arch_number = MACH_TYPE_OMAP3_CAIRO; /* boot param addr */ gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100); return 0; diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c index e2cb94ee13b2..d6a3f20534c3 100644 --- a/board/ronetix/pm9261/pm9261.c +++ b/board/ronetix/pm9261/pm9261.c @@ -228,9 +228,6 @@ int board_early_init_f(void)
int board_init(void) { - /* arch number of PM9261-Board */ - gd->bd->bi_arch_number = MACH_TYPE_PM9261; - /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c index e9f9b67b77dc..08ccbf12ec60 100644 --- a/board/ronetix/pm9263/pm9263.c +++ b/board/ronetix/pm9263/pm9263.c @@ -328,9 +328,6 @@ int board_early_init_f(void)
int board_init(void) { - /* arch number of AT91SAM9263EK-Board */ - gd->bd->bi_arch_number = MACH_TYPE_PM9263; - /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c index c2707e0015dd..47a5da8a7843 100644 --- a/board/ronetix/pm9g45/pm9g45.c +++ b/board/ronetix/pm9g45/pm9g45.c @@ -121,8 +121,6 @@ int board_early_init_f(void)
int board_init(void) { - /* arch number of AT91SAM9M10G45EK-Board */ - gd->bd->bi_arch_number = MACH_TYPE_PM9G45; /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
diff --git a/board/technexion/tao3530/tao3530.c b/board/technexion/tao3530/tao3530.c index d51b5d940c2e..1c344e1f5f58 100644 --- a/board/technexion/tao3530/tao3530.c +++ b/board/technexion/tao3530/tao3530.c @@ -111,8 +111,6 @@ void get_board_mem_timings(struct board_sdrc_timings *timings) int board_init(void) { gpmc_init(); /* in SRAM or SDRAM, finish GPMC */ - /* board id for Linux */ - gd->bd->bi_arch_number = MACH_TYPE_OMAP3_TAO3530; /* boot param addr */ gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 88349921a028..6a012edd7b43 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -26,9 +26,6 @@
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
-#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */ -#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM - /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index d780c3f63c2f..da61c4d7234e 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -31,25 +31,6 @@
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
-#define MACH_TYPE_BOSCH_SHC_B 9001 -#define MACH_TYPE_BOSCH_SHC_B2 9002 -#define MACH_TYPE_BOSCH_SHC_C 9003 -#define MACH_TYPE_BOSCH_SHC_C2 9004 -#define MACH_TYPE_BOSCH_SHC_C3 9005 -#define MACH_TYPE_BOSCH_SHC 9006 -#ifdef CONFIG_B_SAMPLE -# define CONFIG_MACH_TYPE MACH_TYPE_BOSCH_SHC_B -#elif defined CONFIG_B2_SAMPLE -# define CONFIG_MACH_TYPE MACH_TYPE_BOSCH_SHC_B2 -#elif defined CONFIG_C_SAMPLE -# define CONFIG_MACH_TYPE MACH_TYPE_BOSCH_SHC_C -#elif defined CONFIG_C2_SAMPLE -# define CONFIG_MACH_TYPE MACH_TYPE_BOSCH_SHC_C2 -#elif defined CONFIG_C3_SAMPLE -# define CONFIG_MACH_TYPE MACH_TYPE_BOSCH_SHC_C3 -#elif defined CONFIG_SERIES -# define CONFIG_MACH_TYPE MACH_TYPE_BOSCH_SHC -#endif /* #ifdef CONFIG_B_SAMPLE */ /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 4e07e52a1b2a..b1037e1e04b4 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -19,9 +19,6 @@ #include <linux/sizes.h> #include <configs/ti_am335x_common.h>
-#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */ -#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM - /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index f293a343e4bf..7de890f5f055 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -29,9 +29,6 @@
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
-#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */ -#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM - /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 528ed6f6bbd0..24867cf13265 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -21,9 +21,6 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-#define MACH_TYPE_BEAVER 4597 /* not yet in mach-types.h */ -#define CONFIG_MACH_TYPE MACH_TYPE_BEAVER - /* I2C */ #define CONFIG_SYS_I2C_TEGRA
diff --git a/include/configs/calimain.h b/include/configs/calimain.h index dab4ec2aacf4..54c0057b4f46 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -16,8 +16,6 @@ * Board */ #define CONFIG_DRIVER_TI_EMAC -#define MACH_TYPE_CALIMAIN 3528 -#define CONFIG_MACH_TYPE MACH_TYPE_CALIMAIN
/* * SoC Configuration diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 8d5f26a139c3..e37d96707979 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -24,9 +24,6 @@ #undef CONFIG_MAX_RAM_BANK_SIZE #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 512MB */
-#define MACH_TYPE_CM_T335 4586 /* Until the next sync */ -#define CONFIG_MACH_TYPE MACH_TYPE_CM_T335 - /* Clock Defines */ #define V_OSCK 25000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index a71f67c352bb..f9066e7521a1 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -13,12 +13,6 @@ #include <linux/sizes.h> #include <asm/arch/cpu.h>
-/* - * Define DevKit3250 machine type by hand until it lands in mach-types - */ -#define MACH_TYPE_DEVKIT3250 3697 -#define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT3250 - #define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_DCACHE_OFF #if !defined(CONFIG_SPL_BUILD) diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 1b61afd324a7..0d90110ec810 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -14,12 +14,6 @@ #define _CONFIG_DNS325_H
/* - * Machine number definition - */ -#define MACH_TYPE_DNS325 3800 -#define CONFIG_MACH_TYPE MACH_TYPE_DNS325 - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 252e5f5d1e00..336796593a04 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -13,23 +13,9 @@ #define _CONFIG_DREAMPLUG_H
/* - * FIXME: This belongs in mach-types.h. However, we only pull mach-types - * from Linus' kernel.org tree. This hasn't been updated primarily due to - * the recent arch/arm reshuffling. So, in the meantime, we'll place it - * here. - */ -#include <asm/mach-types.h> -#ifdef MACH_TYPE_DREAMPLUG -#error "MACH_TYPE_DREAMPLUG has been defined properly, please remove this." -#else -#define MACH_TYPE_DREAMPLUG 3550 -#endif - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -#define CONFIG_MACH_TYPE MACH_TYPE_DREAMPLUG
/* * Commands configuration diff --git a/include/configs/ds109.h b/include/configs/ds109.h index 222a510034e2..8595716ee30e 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -13,23 +13,9 @@ #define _CONFIG_DS109_H
/* - * FIXME: This belongs in mach-types.h. However, we only pull mach-types - * from Linus' kernel.org tree. This hasn't been updated primarily due to - * the recent arch/arm reshuffling. So, in the meantime, we'll place it - * here. - */ -#include <asm/mach-types.h> -#ifdef MACH_TYPE_SYNOLOGY -#error "MACH_TYPE_SYNOLOGY has been defined properly, please remove this." -#else -#define MACH_TYPE_SYNOLOGY 527 -#endif - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -#define CONFIG_MACH_TYPE MACH_TYPE_SYNOLOGY
/* * Commands configuration diff --git a/include/configs/duovero.h b/include/configs/duovero.h index b5bd3ba651fd..5f44e692ed63 100644 --- a/include/configs/duovero.h +++ b/include/configs/duovero.h @@ -16,8 +16,6 @@ * High Level Configuration Options */ #define CONFIG_DUOVERO -#define MACH_TYPE_OMAP4_DUOVERO 4097 /* Until the next sync */ -#define CONFIG_MACH_TYPE MACH_TYPE_OMAP4_DUOVERO
#include <configs/ti_omap4_common.h>
diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h index c7b0a389c912..443184e5cfb5 100644 --- a/include/configs/eco5pk.h +++ b/include/configs/eco5pk.h @@ -28,9 +28,6 @@ #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3
-#define MACH_TYPE_ECO5_PK 4017 -#define CONFIG_MACH_TYPE MACH_TYPE_ECO5_PK - #define CONFIG_BOOTFILE "uImage" #define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index c78eebfdeff1..ab1233825483 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -18,10 +18,6 @@ /* The first stage boot loader takes care of low level initialization. */ #define CONFIG_SKIP_LOWLEVEL_INIT
-/* Set our official architecture number. */ -#define MACH_TYPE_ETHERNUT5 1971 -#define CONFIG_MACH_TYPE MACH_TYPE_ETHERNUT5 - /* CPU information */ #define CONFIG_ARCH_CPU_INIT
diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h index 846739a6c500..838b48191a90 100644 --- a/include/configs/exynos5250-common.h +++ b/include/configs/exynos5250-common.h @@ -15,10 +15,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define CONFIG_SYS_TEXT_BASE 0x43E00000
-/* MACH_TYPE_SMDK5250 macro will be removed once added to mach-types */ -#define MACH_TYPE_SMDK5250 3774 -#define CONFIG_MACH_TYPE MACH_TYPE_SMDK5250 - #define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024)
#define CONFIG_SPL_TEXT_BASE 0x02023400 diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h index 16153eb59529..f57ef1264717 100644 --- a/include/configs/exynos5420-common.h +++ b/include/configs/exynos5420-common.h @@ -15,9 +15,6 @@
#define CONFIG_EXYNOS5_DT
-#define MACH_TYPE_SMDK5420 8002 -#define CONFIG_MACH_TYPE MACH_TYPE_SMDK5420 - #define CONFIG_VAR_SIZE_SPL
#ifdef CONFIG_VAR_SIZE_SPL diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 0f7b3c82dbe4..618104cbf10e 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -20,13 +20,6 @@
#define CONFIG_SYS_DCACHE_OFF
-/* Only in case the value is not present in mach-types.h */ -#ifndef MACH_TYPE_FLEA3 -#define MACH_TYPE_FLEA3 3668 -#endif - -#define CONFIG_MACH_TYPE MACH_TYPE_FLEA3 - /* Set TEXT at the beginning of the NOR flash */ #define CONFIG_SYS_TEXT_BASE 0xA0000000
diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 37b0a8c50d84..5a87c84127fd 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -16,22 +16,11 @@ #define __CONFIG_GPLUGD_H
/* - * FIXME: fix for error caused due to recent update to mach-types.h - */ -#include <asm/mach-types.h> -#ifdef MACH_TYPE_SHEEVAD -#error "MACH_TYPE_SHEEVAD has been defined properly, please remove this." -#else -#define MACH_TYPE_SHEEVAD 2625 -#endif - -/* * High Level Configuration Options */ #define CONFIG_SHEEVA_88SV331xV5 1 /* CPU Core subversion */ #define CONFIG_ARMADA100 1 /* SOC Family Name */ #define CONFIG_ARMADA168 1 /* SOC Used on this Board */ -#define CONFIG_MACH_TYPE MACH_TYPE_SHEEVAD /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
#define CONFIG_SYS_TEXT_BASE 0x00f00000 diff --git a/include/configs/h2200.h b/include/configs/h2200.h index 18b5488392de..324d2314c161 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -9,9 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H
-#define MACH_TYPE_H2200 341 -#define CONFIG_MACH_TYPE MACH_TYPE_H2200 - #define CONFIG_CPU_PXA25X 1 #define CONFIG_BOARD_H2200
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index bcde7681ab33..909a84fae8ce 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -20,10 +20,6 @@ #ifndef _CONFIG_KM_ARM_H #define _CONFIG_KM_ARM_H
- -/* We got removed from Linux mach-types.h */ -#define MACH_TYPE_KM_KIRKWOOD 2255 - /* * High Level Configuration Options (easy to change) */ @@ -32,7 +28,6 @@ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_MACH_KM_KIRKWOOD /* Machine type */
-#define CONFIG_MACH_TYPE MACH_TYPE_KM_KIRKWOOD
#define CONFIG_NAND_ECC_BCH #define CONFIG_BCH diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 4804fe0ad06d..5a744959880b 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -14,20 +14,12 @@ #define CONFIG_MACH_TYPE MACH_TYPE_INETSPACE_V2 #elif defined(CONFIG_NETSPACE_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_V2 -#elif defined(CONFIG_NETSPACE_LITE_V2) -#define MACH_TYPE_NETSPACE_LITE_V2 2983 /* missing in mach-types.h */ -#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_LITE_V2 -#elif defined(CONFIG_NETSPACE_MINI_V2) -#define MACH_TYPE_NETSPACE_MINI_V2 2831 /* missing in mach-types.h */ -#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MINI_V2 #elif defined(CONFIG_NETSPACE_MAX_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MAX_V2 #elif defined(CONFIG_D2NET_V2) #define CONFIG_MACH_TYPE MACH_TYPE_D2NET_V2 #elif defined(CONFIG_NET2BIG_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NET2BIG_V2 -#else -#error "Unknown board" #endif
/* diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 39cb446a5997..77f08b939a00 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -20,9 +20,6 @@ #define CONFIG_ARM_ERRATA_430973 #define CONFIG_ARM_ERRATA_621766
-#define MACH_TYPE_MCX 3656 -#define CONFIG_MACH_TYPE MACH_TYPE_MCX - #define CONFIG_EMIF4 /* The chip has EMIF4 controller */
#include <asm/arch/cpu.h> /* get chip and board defs */ diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 6b9bb6a52972..f7190feabc05 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -29,14 +29,6 @@ */ #define CONFIG_SYS_TEXT_BASE 0x21F00000
-/* - * since a number of boards are not being listed in linux - * arch/arm/tools/mach-types any more, the mach-types have to be - * defined here - */ -#define MACH_TYPE_MEESC 2165 -#define MACH_TYPE_ETHERCAN2 2407 - /* ARM asynchronous clock */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* 32.768 kHz crystal */ #define CONFIG_SYS_AT91_MAIN_CLOCK 16000000/* 16.0 MHz crystal */ diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index 2420612800fb..bc93a0cfc101 100644 --- a/include/configs/mt_ventoux.h +++ b/include/configs/mt_ventoux.h @@ -19,9 +19,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10) + \ 6 * 1024 * 1024)
-#define MACH_TYPE_AM3517_MT_VENTOUX 3832 -#define CONFIG_MACH_TYPE MACH_TYPE_AM3517_MT_VENTOUX - #define CONFIG_BOOTFILE "uImage" #define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 501d7de54489..a7ed4ac30c25 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -15,9 +15,6 @@ #include "imx6_spl.h" #endif
-#define MACH_TYPE_MX6SLEVK 4307 -#define CONFIG_MACH_TYPE MACH_TYPE_MX6SLEVK - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)
diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 7cfdacd789e2..1c97ccd37d5a 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -13,12 +13,6 @@ #define _CONFIG_NAS220_H
/* - * Machine type definition and ID - */ -#define MACH_TYPE_NAS220 MACH_TYPE_RD88F6192_NAS -#define CONFIG_MACH_TYPE MACH_TYPE_NAS220 - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* #define CPU Core subversion */ diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 09f4ec0b74ec..1382f6ce7e09 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -228,10 +228,6 @@ #define CONFIG_SERIAL2 #endif
-/* Provide MACH_TYPE for compatibility with non-DT kernels */ -#define MACH_TYPE_OMAP3_CAIRO 3063 -#define CONFIG_MACH_TYPE MACH_TYPE_OMAP3_CAIRO - /*----------------------------------------------------------------------- * FLASH and environment organization */ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index c19e7dc9f3b2..6f7d74d630d6 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -31,9 +31,6 @@ #define CONFIG_ARCH_CPU_INIT #define CONFIG_SYS_TEXT_BASE 0
-#define MACH_TYPE_PM9261 1187 -#define CONFIG_MACH_TYPE MACH_TYPE_PM9261 - /* clocks */ /* CKGR_MOR - enable main osc. */ #define CONFIG_SYS_MOR_VAL \ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index eddc81a8bdd0..0ad7d320e295 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -31,9 +31,6 @@ #define CONFIG_ARCH_CPU_INIT #define CONFIG_SYS_TEXT_BASE 0
-#define MACH_TYPE_PM9263 1475 -#define CONFIG_MACH_TYPE MACH_TYPE_PM9263 - /* clocks */ #define CONFIG_SYS_MOR_VAL \ (AT91_PMC_MOR_MOSCEN | \ diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 28690c28faa2..b1b292084a3a 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -25,9 +25,6 @@ #define CONFIG_PM9G45 1 /* It's an Ronetix PM9G45 */ #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45"
-#define MACH_TYPE_PM9G45 2672 -#define CONFIG_MACH_TYPE MACH_TYPE_PM9G45 - /* ARM asynchronous clock */ #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index fb1339c02de9..e7a9f44d2818 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -14,12 +14,6 @@ #define _CONFIG_POGO_E02_H
/* - * Machine type definition and ID - */ -#define MACH_TYPE_POGO_E02 3542 -#define CONFIG_MACH_TYPE MACH_TYPE_POGO_E02 - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 42d3060ec31c..b49804033199 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -24,8 +24,6 @@ #define CONFIG_ARM_ERRATA_430973 #define CONFIG_ARM_ERRATA_621766
-#define MACH_TYPE_OMAP3_TAO3530 2836 - #define CONFIG_SDRC /* Has an SDRC controller */
#include <asm/arch/cpu.h> /* get chip and board defs */ diff --git a/include/configs/titanium.h b/include/configs/titanium.h index bbdaf0443d9f..13cd8b6bda8c 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -17,9 +17,6 @@
#define CONFIG_MX6Q
-#define MACH_TYPE_TITANIUM 3769 -#define CONFIG_MACH_TYPE MACH_TYPE_TITANIUM - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024)
diff --git a/include/configs/trats.h b/include/configs/trats.h index a771ddb27c5b..6a25f1ecd6bb 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -40,12 +40,6 @@ #define CONFIG_SERIAL2 #define CONFIG_BAUDRATE 115200
-/* Console configuration */ - -/* MACH_TYPE_TRATS macro will be removed once added to mach-types */ -#define MACH_TYPE_TRATS 3928 -#define CONFIG_MACH_TYPE MACH_TYPE_TRATS - #define CONFIG_BOOTARGS "Please use defined boot" #define CONFIG_BOOTCOMMAND "run autoboot" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" diff --git a/include/configs/twister.h b/include/configs/twister.h index fd117b8260c1..82a279865aff 100644 --- a/include/configs/twister.h +++ b/include/configs/twister.h @@ -14,13 +14,9 @@
#include "tam3517-common.h"
-#define MACH_TYPE_TAM3517 2818 -#define CONFIG_MACH_TYPE MACH_TYPE_TAM3517 - #define CONFIG_TAM3517_SW3_SETTINGS #define CONFIG_XR16L2751
- #define CONFIG_BOOTFILE "uImage"
#define CONFIG_HOSTNAME twister diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 05687dda4a7b..c2e9149c8ca2 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -13,9 +13,6 @@
#include "imx6_spl.h"
-#define MACH_TYPE_UDOO 4800 -#define CONFIG_MACH_TYPE MACH_TYPE_UDOO - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M)
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 4aaeea91fe0d..f536057c463d 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -20,13 +20,6 @@
#define CONFIG_SYS_DCACHE_OFF
-/* Only in case the value is not present in mach-types.h */ -#ifndef MACH_TYPE_FLEA3 -#define MACH_TYPE_FLEA3 3668 -#endif - -#define CONFIG_MACH_TYPE MACH_TYPE_FLEA3 - /* This is required to setup the ESDC controller */
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index b08641fcf0da..f9a97cacc338 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -14,13 +14,6 @@ #include <linux/sizes.h> #include <asm/arch/cpu.h>
-/* - * Define work_92105 machine type by hand -- done only for compatibility - * with original board code - */ -#define MACH_TYPE_WORK_92105 736 -#define CONFIG_MACH_TYPE MACH_TYPE_WORK_92105 - #define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_DCACHE_OFF #if !defined(CONFIG_SPL_BUILD)
A few boards were defining a MACH_TYPE_xxx name and value until it had been synced in officially. These values now are here so remove the config header defines.
Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/am335x_igep0033.h | 1 - include/configs/apx4devkit.h | 1 - include/configs/dalmore.h | 2 -- include/configs/draco.h | 1 - include/configs/m28evk.h | 1 - include/configs/pcm051.h | 1 - include/configs/pepper.h | 1 - include/configs/pxm2.h | 1 - include/configs/rut.h | 1 - include/configs/sc_sps_1.h | 1 - include/configs/wandboard.h | 3 +-- 11 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/include/configs/am335x_igep0033.h b/include/configs/am335x_igep0033.h index 16fb1ae8aa6a..7bf1f3bf5984 100644 --- a/include/configs/am335x_igep0033.h +++ b/include/configs/am335x_igep0033.h @@ -18,7 +18,6 @@ #include <configs/ti_am335x_common.h>
/* Mach type */ -#define MACH_TYPE_IGEP0033 4521 /* Until the next sync */ #define CONFIG_MACH_TYPE MACH_TYPE_IGEP0033
/* Clock defines */ diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index babaf2671e36..48015445e3ea 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -16,7 +16,6 @@
/* System configurations */ #define CONFIG_MX28 /* i.MX28 SoC */ -#define MACH_TYPE_APX4DEVKIT 3712 #define CONFIG_MACH_TYPE MACH_TYPE_APX4DEVKIT
/* U-Boot Commands */ diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index a0f04f9ce33c..1fa445a94c85 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -32,8 +32,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
-#define MACH_TYPE_DALMORE 4304 /* not yet in mach-types.h */ - /* SPI */ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/draco.h b/include/configs/draco.h index b4ca982e1843..838fdb549124 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -14,7 +14,6 @@ #define __CONFIG_DRACO_H
#define CONFIG_SIEMENS_DRACO -#define MACH_TYPE_DRACO 4314 #define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_DRACO
#include "siemens-am33x-common.h" diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 25884b41466d..7d2c88cfe614 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -9,7 +9,6 @@
/* System configurations */ #define CONFIG_MX28 /* i.MX28 SoC */ -#define MACH_TYPE_M28EVK 3613 #define CONFIG_MACH_TYPE MACH_TYPE_M28EVK
#define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index aff4635e90e6..abd00c483ea7 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -22,7 +22,6 @@ #include <configs/ti_am335x_common.h>
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#define MACH_TYPE_PCM051 4144 /* Until the next sync */ #define CONFIG_MACH_TYPE MACH_TYPE_PCM051
/* set to negative value for no autoboot */ diff --git a/include/configs/pepper.h b/include/configs/pepper.h index 6034baa63410..9552dd1bcbba 100644 --- a/include/configs/pepper.h +++ b/include/configs/pepper.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
/* Mach type */ -#define MACH_TYPE_PEPPER 4207 /* Until the next sync */ #define CONFIG_MACH_TYPE MACH_TYPE_PEPPER
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index d797a2ce4d7b..4776e97ed6a8 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -15,7 +15,6 @@ #define __CONFIG_PXM2_H
#define CONFIG_SIEMENS_PXM2 -#define MACH_TYPE_PXM2 4309 #define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_PXM2
#include "siemens-am33x-common.h" diff --git a/include/configs/rut.h b/include/configs/rut.h index e5933b85ee12..1a939e9de74a 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -15,7 +15,6 @@ #define __CONFIG_RUT_H
#define CONFIG_SIEMENS_RUT -#define MACH_TYPE_RUT 4316 #define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_RUT
#include "siemens-am33x-common.h" diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index 56a23a6ef00a..c23f665e1af3 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -11,7 +11,6 @@
/* System configuration */ #define CONFIG_MX28 /* i.MX28 SoC */ -#define MACH_TYPE_SC_SPS_1 4172 #define CONFIG_MACH_TYPE MACH_TYPE_SC_SPS_1
/* U-Boot Commands */ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 125c74ed1e95..11f3f5736d20 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -14,8 +14,7 @@
#include "imx6_spl.h"
-#define MACH_TYPE_WANDBOARD 4412 -#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD +#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD_IMX6
/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
Hi Tom,
On 01/24/2017 11:31 PM, Tom Rini wrote:
We have a number of instances of platforms that define a MACH_TYPE_xxx value and number. We are currently synced with the latest vales from the Linux Kernel and in turn if numbers are not used there it is because they were never officially used anywhere. We drop all our instances of these numbers.
[snip]
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index a71f67c352bb..f9066e7521a1 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -13,12 +13,6 @@ #include <linux/sizes.h> #include <asm/arch/cpu.h>
-/*
- Define DevKit3250 machine type by hand until it lands in mach-types
- */
-#define MACH_TYPE_DEVKIT3250 3697 -#define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT3250
in fact this is a registered ARM machine type for the board, please reference the list on http://www.arm.linux.org.uk/developer/machines/
This may impact some other boards from your list, but as for DevKit3250 board the MACH_TYPE is not in use, so please feel free to remove it.
For devkit3250:
Acked-by: Vladimir Zapolskiy vz@mleia.com
#define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_DCACHE_OFF #if !defined(CONFIG_SPL_BUILD)
-- With best wishes, Vladimir
[re-sending without a URL in it]
On Wed, Jan 25, 2017 at 12:28:47AM +0200, Vladimir Zapolskiy wrote:
Hi Tom,
On 01/24/2017 11:31 PM, Tom Rini wrote:
We have a number of instances of platforms that define a MACH_TYPE_xxx value and number. We are currently synced with the latest vales from the Linux Kernel and in turn if numbers are not used there it is because they were never officially used anywhere. We drop all our instances of these numbers.
[snip]
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index a71f67c352bb..f9066e7521a1 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -13,12 +13,6 @@ #include <linux/sizes.h> #include <asm/arch/cpu.h>
-/*
- Define DevKit3250 machine type by hand until it lands in mach-types
- */
-#define MACH_TYPE_DEVKIT3250 3697 -#define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT3250
in fact this is a registered ARM machine type for the board, please reference the list on http://www.arm.linux.org.uk/developer/machines/
So I talked with rmk about this quickly and the reduced list, which is what the kernel uses and I also wish to use is the reduced list of MACH_TYPE_xxx and the short version is that the reduced list only includes the MACH_TYPE_xxx values that were used in mainline rather than just registered. Perhaps instead of saying "officially used" I should make it clearer that it means used in the upstream linux kernel?
On 01/25/2017 01:13 AM, Tom Rini wrote:
[re-sending without a URL in it]
On Wed, Jan 25, 2017 at 12:28:47AM +0200, Vladimir Zapolskiy wrote:
Hi Tom,
On 01/24/2017 11:31 PM, Tom Rini wrote:
We have a number of instances of platforms that define a MACH_TYPE_xxx value and number. We are currently synced with the latest vales from the Linux Kernel and in turn if numbers are not used there it is because they were never officially used anywhere. We drop all our instances of these numbers.
[snip]
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index a71f67c352bb..f9066e7521a1 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -13,12 +13,6 @@ #include <linux/sizes.h> #include <asm/arch/cpu.h>
-/*
- Define DevKit3250 machine type by hand until it lands in mach-types
- */
-#define MACH_TYPE_DEVKIT3250 3697 -#define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT3250
in fact this is a registered ARM machine type for the board, please
Here I'm cutting off the link sent to the mailing list.
So I talked with rmk about this quickly and the reduced list, which is what the kernel uses and I also wish to use is the reduced list of MACH_TYPE_xxx and the short version is that the reduced list only includes the MACH_TYPE_xxx values that were used in mainline rather than just registered. Perhaps instead of saying "officially used" I should make it clearer that it means used in the upstream linux kernel?
Right, just the usage of the list in the upstream Linux kernel is assumed.
I see a few more points for consideration.
1) From Documentation/arm/README the list of machine type IDs is only usable for non-DT machines and combined DT/non-DT machines. I suppose it should be rather safe to remove mach types from U-Boot board files for all archs/boards with CONFIG_OF_LIBFDT build option selected, for example the DevKit3250 board falls into this category. By this criterion you may consider to split the change into two -- one change is safe, another change updates legacy or badly maintained boards.
2) The reduced mach-types list is used by Linux, I'm not sure and it may happen that other OS kernels recognize the complete list. Also if by chance someone wants to update a U-Boot image and keep the old Linux kernel, there is a possibility that the old kernel won't boot.
3) From header info in the Russell's mach-types file, the reduced list enumerates machines found in vanilla or machines with information not edited for one year. Generally this is a soft enforcement to push machine support to the kernel officially (or better switch it to DT), because unlikely once correctly added information needs any further updates, and most of the entries are removed due to this reason.
Hypothetically it could be possible that a machine maintainer finds that after rebasing private changes on top of the latest Linux release, a board mach type is not recognized by the Linux kernel due to an expired and removed entry in mach-types, then s/he updates a record in Russell's DB to get the old machine type ID again. However a counterpart change in U-boot board config won't be synced automatically, and IMHO it should be stated that this problem is neglected, obviously because it causes maintenance burden for no gain.
That said, your change is good, it may produce a discontent in particular cases, but it won't be problematic to remove it by partial commit reverting and adding an explanatory comment into the code.
-- With best wishes, Vladimir
Hi guys,
On 01/25/17 03:34, Vladimir Zapolskiy wrote:
On 01/25/2017 01:13 AM, Tom Rini wrote:
[re-sending without a URL in it]
On Wed, Jan 25, 2017 at 12:28:47AM +0200, Vladimir Zapolskiy wrote:
Hi Tom,
On 01/24/2017 11:31 PM, Tom Rini wrote:
We have a number of instances of platforms that define a MACH_TYPE_xxx value and number. We are currently synced with the latest vales from the Linux Kernel and in turn if numbers are not used there it is because they were never officially used anywhere. We drop all our instances of these numbers.
[snip]
[...]
So I talked with rmk about this quickly and the reduced list, which is what the kernel uses and I also wish to use is the reduced list of MACH_TYPE_xxx and the short version is that the reduced list only includes the MACH_TYPE_xxx values that were used in mainline rather than just registered. Perhaps instead of saying "officially used" I should make it clearer that it means used in the upstream linux kernel?
Right, just the usage of the list in the upstream Linux kernel is assumed.
I see a few more points for consideration.
- From Documentation/arm/README the list of machine type IDs is only
usable for non-DT machines and combined DT/non-DT machines. I suppose it should be rather safe to remove mach types from U-Boot board files for all archs/boards with CONFIG_OF_LIBFDT build option selected, for example the DevKit3250 board falls into this category. By this criterion you may consider to split the change into two -- one change is safe, another change updates legacy or badly maintained boards.
- The reduced mach-types list is used by Linux, I'm not sure and it
may happen that other OS kernels recognize the complete list. Also if by chance someone wants to update a U-Boot image and keep the old Linux kernel, there is a possibility that the old kernel won't boot.
cm-t335 is an example of such machine. Most of our cm-t335 customers use non-DT kernel 3.2 in their production. Removing cm-t335 mach type will prevent us to provide them with an updated bootloader, or will force us to maintain an out of tree patch...
- From header info in the Russell's mach-types file, the reduced list
enumerates machines found in vanilla or machines with information not edited for one year. Generally this is a soft enforcement to push machine support to the kernel officially (or better switch it to DT), because unlikely once correctly added information needs any further updates, and most of the entries are removed due to this reason.
Hypothetically it could be possible that a machine maintainer finds that after rebasing private changes on top of the latest Linux release, a board mach type is not recognized by the Linux kernel due to an expired and removed entry in mach-types, then s/he updates a record in Russell's DB to get the old machine type ID again. However a counterpart change in U-boot board config won't be synced automatically, and IMHO it should be stated that this problem is neglected, obviously because it causes maintenance burden for no gain.
That said, your change is good, it may produce a discontent in particular cases, but it won't be problematic to remove it by partial commit reverting and adding an explanatory comment into the code.
-- With best wishes, Vladimir
Hi Vladimir,
Le Wed, 25 Jan 2017 03:34:13 +0200, Vladimir Zapolskiy vz@mleia.com a écrit :
Hypothetically it could be possible that a machine maintainer finds that after rebasing private changes on top of the latest Linux release, a board mach type is not recognized by the Linux kernel due to an expired and removed entry in mach-types, then s/he updates a record in Russell's DB to get the old machine type ID again. However a counterpart change in U-boot board config won't be synced automatically, and IMHO it should be stated that this problem is neglected, obviously because it causes maintenance burden for no gain.
I suspect there's also a case where a custom (non-mainline) kernel is used on a given board and expects a machine ID from U-Boot, but this machine ID is not required to be in RMK's list. Ugly, but such things happen.
That said, your change is good, it may produce a discontent in particular cases, but it won't be problematic to remove it by partial commit reverting and adding an explanatory comment into the code.
Agreed.
-- With best wishes, Vladimir
Cordialement, Albert ARIBAUD 3ADEV
On Wed, Jan 25, 2017 at 08:23:53AM +0100, Albert ARIBAUD wrote:
Hi Vladimir,
Le Wed, 25 Jan 2017 03:34:13 +0200, Vladimir Zapolskiy vz@mleia.com a écrit :
Hypothetically it could be possible that a machine maintainer finds that after rebasing private changes on top of the latest Linux release, a board mach type is not recognized by the Linux kernel due to an expired and removed entry in mach-types, then s/he updates a record in Russell's DB to get the old machine type ID again. However a counterpart change in U-boot board config won't be synced automatically, and IMHO it should be stated that this problem is neglected, obviously because it causes maintenance burden for no gain.
I suspect there's also a case where a custom (non-mainline) kernel is used on a given board and expects a machine ID from U-Boot, but this machine ID is not required to be in RMK's list. Ugly, but such things happen.
That said, your change is good, it may produce a discontent in particular cases, but it won't be problematic to remove it by partial commit reverting and adding an explanatory comment into the code.
Agreed.
Sigh, I guess we've got enough cases of this that I'll re-work things based on the full mach-types list instead. Thanks folks!
Hi Tom,
On 01/24/17 23:31, Tom Rini wrote:
We have a number of instances of platforms that define a MACH_TYPE_xxx value and number. We are currently synced with the latest vales from the Linux Kernel and in turn if numbers are not used there it is because they were never officially used anywhere. We drop all our instances of these numbers.
[...]
include/configs/cm_t335.h | 3 ---
[...]
diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 8d5f26a139c3..e37d96707979 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -24,9 +24,6 @@ #undef CONFIG_MAX_RAM_BANK_SIZE #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 512MB */
-#define MACH_TYPE_CM_T335 4586 /* Until the next sync */ -#define CONFIG_MACH_TYPE MACH_TYPE_CM_T335
/* Clock Defines */ #define V_OSCK 25000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK)
Most of cm-t335 customers use non-DT Linux kernel 3.2 in production. I'd really appreciate if we can keep the two above lines, so we or our customers can just update/use the upstream U-Boot. In fact, this is the only board that received Linux upstream DT-only support while there were non-DT kernels released to customers.
participants (4)
-
Albert ARIBAUD -
Igor Grinberg -
Tom Rini -
Vladimir Zapolskiy