Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 92a1babf75e90b45026ef0b0e83a6be0343fb70a

Authored by Tom Rini
1 parent 94ba26f2bc
Exists in smarc_8mq_lf_v2020.04 and in 22 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

arm: Clean up MACH_TYPE_xxx usage after re-sync of mach-types 

With the latest mach-types values we have many instances where we no
longer need to define a value and a few cases where the name (but not
value) have changed slightly.

Signed-off-by: Tom Rini <trini@konsulko.com>

Showing 45 changed files with 12 additions and 103 deletions Side-by-side Diff

board/Marvell/gplugd/gplugd.c
Diff comments   View file @ 92a1bab
... ... @@ -76,7 +76,7 @@
76 76 (struct armd1apb2_registers *)ARMD1_APBC2_BASE;
77 77  
78 78 /* arch number of Board */
79   - gd->bd->bi_arch_number = MACH_TYPE_SHEEVAD;
  79 + gd->bd->bi_arch_number = MACH_TYPE_GPLUGD;
80 80 /* adress of boot parameters */
81 81 gd->bd->bi_boot_params = armd1_sdram_base(0) + 0x100;
82 82 /* Assert PHY_RST# */
board/Seagate/nas220/nas220.c
Diff comments   View file @ 92a1bab
... ... @@ -75,7 +75,7 @@
75 75 /*
76 76 * arch number of board
77 77 */
78   - gd->bd->bi_arch_number = MACH_TYPE_NAS220;
  78 + gd->bd->bi_arch_number = MACH_TYPE_RD88F6192_NAS;
79 79  
80 80 /* adress of boot parameters */
81 81 gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100;
board/gumstix/duovero/duovero.c
Diff comments   View file @ 92a1bab
... ... @@ -47,7 +47,7 @@
47 47 {
48 48 gpmc_init();
49 49  
50   - gd->bd->bi_arch_number = MACH_TYPE_OMAP4_DUOVERO;
  50 + gd->bd->bi_arch_number = MACH_TYPE_DUOVERO;
51 51 gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
52 52  
53 53 return 0;
include/configs/am335x_evm.h
Diff comments   View file @ 92a1bab
... ... @@ -26,8 +26,7 @@
26 26  
27 27 #define CONFIG_SYS_BOOTM_LEN (16 << 20)
28 28  
29   -#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */
30   -#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM
  29 +#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM
31 30  
32 31 /* Clock Defines */
33 32 #define V_OSCK 24000000 /* Clock output from T2 */
include/configs/am335x_igep0033.h
Diff comments   View file @ 92a1bab
... ... @@ -18,7 +18,6 @@
18 18 #include <configs/ti_am335x_common.h>
19 19  
20 20 /* Mach type */
21   -#define MACH_TYPE_IGEP0033 4521 /* Until the next sync */
22 21 #define CONFIG_MACH_TYPE MACH_TYPE_IGEP0033
23 22  
24 23 /* Clock defines */
include/configs/apx4devkit.h
Diff comments   View file @ 92a1bab
... ... @@ -16,7 +16,6 @@
16 16  
17 17 /* System configurations */
18 18 #define CONFIG_MX28 /* i.MX28 SoC */
19   -#define MACH_TYPE_APX4DEVKIT 3712
20 19 #define CONFIG_MACH_TYPE MACH_TYPE_APX4DEVKIT
21 20  
22 21 /* U-Boot Commands */
include/configs/baltos.h
Diff comments   View file @ 92a1bab
... ... @@ -19,8 +19,7 @@
19 19 #include <linux/sizes.h>
20 20 #include <configs/ti_am335x_common.h>
21 21  
22   -#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */
23   -#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM
  22 +#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM
24 23  
25 24 /* Clock Defines */
26 25 #define V_OSCK 24000000 /* Clock output from T2 */
include/configs/bav335x.h
Diff comments   View file @ 92a1bab
... ... @@ -29,8 +29,7 @@
29 29  
30 30 #define CONFIG_SYS_BOOTM_LEN (16 << 20)
31 31  
32   -#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */
33   -#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM
  32 +#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM
34 33  
35 34 /* Clock Defines */
36 35 #define V_OSCK 24000000 /* Clock output from T2 */
include/configs/beaver.h
Diff comments   View file @ 92a1bab
... ... @@ -21,7 +21,6 @@
21 21 #define CONFIG_TEGRA_ENABLE_UARTA
22 22 #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
23 23  
24   -#define MACH_TYPE_BEAVER 4597 /* not yet in mach-types.h */
25 24 #define CONFIG_MACH_TYPE MACH_TYPE_BEAVER
26 25  
27 26 /* I2C */
include/configs/calimain.h
Diff comments   View file @ 92a1bab
... ... @@ -16,7 +16,6 @@
16 16 * Board
17 17 */
18 18 #define CONFIG_DRIVER_TI_EMAC
19   -#define MACH_TYPE_CALIMAIN 3528
20 19 #define CONFIG_MACH_TYPE MACH_TYPE_CALIMAIN
21 20  
22 21 /*
include/configs/cm_t335.h
Diff comments   View file @ 92a1bab
... ... @@ -24,7 +24,6 @@
24 24 #undef CONFIG_MAX_RAM_BANK_SIZE
25 25 #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 512MB */
26 26  
27   -#define MACH_TYPE_CM_T335 4586 /* Until the next sync */
28 27 #define CONFIG_MACH_TYPE MACH_TYPE_CM_T335
29 28  
30 29 /* Clock Defines */
include/configs/dalmore.h
Diff comments   View file @ 92a1bab
... ... @@ -32,8 +32,6 @@
32 32 #define CONFIG_SYS_MMC_ENV_PART 2
33 33 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
34 34  
35   -#define MACH_TYPE_DALMORE 4304 /* not yet in mach-types.h */
36   -
37 35 /* SPI */
38 36 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
39 37 #define CONFIG_SF_DEFAULT_SPEED 24000000
include/configs/devkit3250.h
Diff comments   View file @ 92a1bab
... ... @@ -13,10 +13,6 @@
13 13 #include <linux/sizes.h>
14 14 #include <asm/arch/cpu.h>
15 15  
16   -/*
17   - * Define DevKit3250 machine type by hand until it lands in mach-types
18   - */
19   -#define MACH_TYPE_DEVKIT3250 3697
20 16 #define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT3250
21 17  
22 18 #define CONFIG_SYS_ICACHE_OFF
include/configs/dns325.h
Diff comments   View file @ 92a1bab
... ... @@ -16,7 +16,6 @@
16 16 /*
17 17 * Machine number definition
18 18 */
19   -#define MACH_TYPE_DNS325 3800
20 19 #define CONFIG_MACH_TYPE MACH_TYPE_DNS325
21 20  
22 21 /*
include/configs/draco.h
Diff comments   View file @ 92a1bab
... ... @@ -14,7 +14,6 @@
14 14 #define __CONFIG_DRACO_H
15 15  
16 16 #define CONFIG_SIEMENS_DRACO
17   -#define MACH_TYPE_DRACO 4314
18 17 #define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_DRACO
19 18  
20 19 #include "siemens-am33x-common.h"
include/configs/dreamplug.h
Diff comments   View file @ 92a1bab
... ... @@ -13,19 +13,6 @@
13 13 #define _CONFIG_DREAMPLUG_H
14 14  
15 15 /*
16   - * FIXME: This belongs in mach-types.h. However, we only pull mach-types
17   - * from Linus' kernel.org tree. This hasn't been updated primarily due to
18   - * the recent arch/arm reshuffling. So, in the meantime, we'll place it
19   - * here.
20   - */
21   -#include <asm/mach-types.h>
22   -#ifdef MACH_TYPE_DREAMPLUG
23   -#error "MACH_TYPE_DREAMPLUG has been defined properly, please remove this."
24   -#else
25   -#define MACH_TYPE_DREAMPLUG 3550
26   -#endif
27   -
28   -/*
29 16 * High Level Configuration Options (easy to change)
30 17 */
31 18 #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */
include/configs/duovero.h
Diff comments   View file @ 92a1bab
... ... @@ -16,8 +16,7 @@
16 16 * High Level Configuration Options
17 17 */
18 18 #define CONFIG_DUOVERO
19   -#define MACH_TYPE_OMAP4_DUOVERO 4097 /* Until the next sync */
20   -#define CONFIG_MACH_TYPE MACH_TYPE_OMAP4_DUOVERO
  19 +#define CONFIG_MACH_TYPE MACH_TYPE_DUOVERO
21 20  
22 21 #include <configs/ti_omap4_common.h>
23 22  
include/configs/eco5pk.h
Diff comments   View file @ 92a1bab
... ... @@ -28,7 +28,6 @@
28 28 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
29 29 #define CONFIG_SERIAL3
30 30  
31   -#define MACH_TYPE_ECO5_PK 4017
32 31 #define CONFIG_MACH_TYPE MACH_TYPE_ECO5_PK
33 32  
34 33 #define CONFIG_BOOTFILE "uImage"
include/configs/ethernut5.h
Diff comments   View file @ 92a1bab
... ... @@ -19,7 +19,6 @@
19 19 #define CONFIG_SKIP_LOWLEVEL_INIT
20 20  
21 21 /* Set our official architecture number. */
22   -#define MACH_TYPE_ETHERNUT5 1971
23 22 #define CONFIG_MACH_TYPE MACH_TYPE_ETHERNUT5
24 23  
25 24 /* CPU information */
include/configs/exynos5250-common.h
Diff comments   View file @ 92a1bab
... ... @@ -15,8 +15,6 @@
15 15 #define CONFIG_SYS_SDRAM_BASE 0x40000000
16 16 #define CONFIG_SYS_TEXT_BASE 0x43E00000
17 17  
18   -/* MACH_TYPE_SMDK5250 macro will be removed once added to mach-types */
19   -#define MACH_TYPE_SMDK5250 3774
20 18 #define CONFIG_MACH_TYPE MACH_TYPE_SMDK5250
21 19  
22 20 #define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024)
include/configs/flea3.h
Diff comments   View file @ 92a1bab
... ... @@ -20,11 +20,6 @@
20 20  
21 21 #define CONFIG_SYS_DCACHE_OFF
22 22  
23   -/* Only in case the value is not present in mach-types.h */
24   -#ifndef MACH_TYPE_FLEA3
25   -#define MACH_TYPE_FLEA3 3668
26   -#endif
27   -
28 23 #define CONFIG_MACH_TYPE MACH_TYPE_FLEA3
29 24  
30 25 /* Set TEXT at the beginning of the NOR flash */
include/configs/gplugd.h
Diff comments   View file @ 92a1bab
... ... @@ -16,22 +16,12 @@
16 16 #define __CONFIG_GPLUGD_H
17 17  
18 18 /*
19   - * FIXME: fix for error caused due to recent update to mach-types.h
20   - */
21   -#include <asm/mach-types.h>
22   -#ifdef MACH_TYPE_SHEEVAD
23   -#error "MACH_TYPE_SHEEVAD has been defined properly, please remove this."
24   -#else
25   -#define MACH_TYPE_SHEEVAD 2625
26   -#endif
27   -
28   -/*
29 19 * High Level Configuration Options
30 20 */
31 21 #define CONFIG_SHEEVA_88SV331xV5 1 /* CPU Core subversion */
32 22 #define CONFIG_ARMADA100 1 /* SOC Family Name */
33 23 #define CONFIG_ARMADA168 1 /* SOC Used on this Board */
34   -#define CONFIG_MACH_TYPE MACH_TYPE_SHEEVAD /* Machine type */
  24 +#define CONFIG_MACH_TYPE MACH_TYPE_GPLUGD /* Machine type */
35 25 #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
36 26  
37 27 #define CONFIG_SYS_TEXT_BASE 0x00f00000
include/configs/h2200.h
Diff comments   View file @ 92a1bab
... ... @@ -9,7 +9,6 @@
9 9 #ifndef __CONFIG_H
10 10 #define __CONFIG_H
11 11  
12   -#define MACH_TYPE_H2200 341
13 12 #define CONFIG_MACH_TYPE MACH_TYPE_H2200
14 13  
15 14 #define CONFIG_CPU_PXA25X 1
include/configs/km/km_arm.h
Diff comments   View file @ 92a1bab
... ... @@ -20,10 +20,6 @@
20 20 #ifndef _CONFIG_KM_ARM_H
21 21 #define _CONFIG_KM_ARM_H
22 22  
23   -
24   -/* We got removed from Linux mach-types.h */
25   -#define MACH_TYPE_KM_KIRKWOOD 2255
26   -
27 23 /*
28 24 * High Level Configuration Options (easy to change)
29 25 */
include/configs/lacie_kw.h
Diff comments   View file @ 92a1bab
... ... @@ -15,10 +15,8 @@
15 15 #elif defined(CONFIG_NETSPACE_V2)
16 16 #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_V2
17 17 #elif defined(CONFIG_NETSPACE_LITE_V2)
18   -#define MACH_TYPE_NETSPACE_LITE_V2 2983 /* missing in mach-types.h */
19 18 #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_LITE_V2
20 19 #elif defined(CONFIG_NETSPACE_MINI_V2)
21   -#define MACH_TYPE_NETSPACE_MINI_V2 2831 /* missing in mach-types.h */
22 20 #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MINI_V2
23 21 #elif defined(CONFIG_NETSPACE_MAX_V2)
24 22 #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MAX_V2
include/configs/m28evk.h
Diff comments   View file @ 92a1bab
... ... @@ -9,7 +9,6 @@
9 9  
10 10 /* System configurations */
11 11 #define CONFIG_MX28 /* i.MX28 SoC */
12   -#define MACH_TYPE_M28EVK 3613
13 12 #define CONFIG_MACH_TYPE MACH_TYPE_M28EVK
14 13  
15 14 #define CONFIG_TIMESTAMP /* Print image info with timestamp */
include/configs/mcx.h
Diff comments   View file @ 92a1bab
... ... @@ -20,7 +20,6 @@
20 20 #define CONFIG_ARM_ERRATA_430973
21 21 #define CONFIG_ARM_ERRATA_621766
22 22  
23   -#define MACH_TYPE_MCX 3656
24 23 #define CONFIG_MACH_TYPE MACH_TYPE_MCX
25 24  
26 25 #define CONFIG_EMIF4 /* The chip has EMIF4 controller */
include/configs/meesc.h
Diff comments   View file @ 92a1bab
... ... @@ -29,14 +29,6 @@
29 29 */
30 30 #define CONFIG_SYS_TEXT_BASE 0x21F00000
31 31  
32   -/*
33   - * since a number of boards are not being listed in linux
34   - * arch/arm/tools/mach-types any more, the mach-types have to be
35   - * defined here
36   - */
37   -#define MACH_TYPE_MEESC 2165
38   -#define MACH_TYPE_ETHERCAN2 2407
39   -
40 32 /* ARM asynchronous clock */
41 33 #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* 32.768 kHz crystal */
42 34 #define CONFIG_SYS_AT91_MAIN_CLOCK 16000000/* 16.0 MHz crystal */
include/configs/mt_ventoux.h
Diff comments   View file @ 92a1bab
... ... @@ -19,7 +19,6 @@
19 19 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10) + \
20 20 6 * 1024 * 1024)
21 21  
22   -#define MACH_TYPE_AM3517_MT_VENTOUX 3832
23 22 #define CONFIG_MACH_TYPE MACH_TYPE_AM3517_MT_VENTOUX
24 23  
25 24 #define CONFIG_BOOTFILE "uImage"
include/configs/mx6slevk.h
Diff comments   View file @ 92a1bab
... ... @@ -15,8 +15,7 @@
15 15 #include "imx6_spl.h"
16 16 #endif
17 17  
18   -#define MACH_TYPE_MX6SLEVK 4307
19   -#define CONFIG_MACH_TYPE MACH_TYPE_MX6SLEVK
  18 +#define CONFIG_MACH_TYPE MACH_TYPE_MX6SL_EVK
20 19  
21 20 /* Size of malloc() pool */
22 21 #define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)
include/configs/nas220.h
Diff comments   View file @ 92a1bab
... ... @@ -13,10 +13,9 @@
13 13 #define _CONFIG_NAS220_H
14 14  
15 15 /*
16   - * Machine type definition and ID
  16 + * Machine type ID
17 17 */
18   -#define MACH_TYPE_NAS220 MACH_TYPE_RD88F6192_NAS
19   -#define CONFIG_MACH_TYPE MACH_TYPE_NAS220
  18 +#define CONFIG_MACH_TYPE MACH_TYPE_RD88F6192_NAS
20 19  
21 20 /*
22 21 * High Level Configuration Options (easy to change)
include/configs/pcm051.h
Diff comments   View file @ 92a1bab
... ... @@ -22,7 +22,6 @@
22 22 #include <configs/ti_am335x_common.h>
23 23  
24 24 #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
25   -#define MACH_TYPE_PCM051 4144 /* Until the next sync */
26 25 #define CONFIG_MACH_TYPE MACH_TYPE_PCM051
27 26  
28 27 /* set to negative value for no autoboot */
include/configs/pepper.h
Diff comments   View file @ 92a1bab
... ... @@ -16,7 +16,6 @@
16 16 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
17 17  
18 18 /* Mach type */
19   -#define MACH_TYPE_PEPPER 4207 /* Until the next sync */
20 19 #define CONFIG_MACH_TYPE MACH_TYPE_PEPPER
21 20  
22 21 #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
include/configs/pm9261.h
Diff comments   View file @ 92a1bab
... ... @@ -31,7 +31,6 @@
31 31 #define CONFIG_ARCH_CPU_INIT
32 32 #define CONFIG_SYS_TEXT_BASE 0
33 33  
34   -#define MACH_TYPE_PM9261 1187
35 34 #define CONFIG_MACH_TYPE MACH_TYPE_PM9261
36 35  
37 36 /* clocks */
include/configs/pm9263.h
Diff comments   View file @ 92a1bab
... ... @@ -31,7 +31,6 @@
31 31 #define CONFIG_ARCH_CPU_INIT
32 32 #define CONFIG_SYS_TEXT_BASE 0
33 33  
34   -#define MACH_TYPE_PM9263 1475
35 34 #define CONFIG_MACH_TYPE MACH_TYPE_PM9263
36 35  
37 36 /* clocks */
include/configs/pm9g45.h
Diff comments   View file @ 92a1bab
... ... @@ -25,7 +25,6 @@
25 25 #define CONFIG_PM9G45 1 /* It's an Ronetix PM9G45 */
26 26 #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45"
27 27  
28   -#define MACH_TYPE_PM9G45 2672
29 28 #define CONFIG_MACH_TYPE MACH_TYPE_PM9G45
30 29  
31 30 /* ARM asynchronous clock */
include/configs/pogo_e02.h
Diff comments   View file @ 92a1bab
... ... @@ -16,7 +16,6 @@
16 16 /*
17 17 * Machine type definition and ID
18 18 */
19   -#define MACH_TYPE_POGO_E02 3542
20 19 #define CONFIG_MACH_TYPE MACH_TYPE_POGO_E02
21 20  
22 21 /*
include/configs/pxm2.h
Diff comments   View file @ 92a1bab
... ... @@ -15,7 +15,6 @@
15 15 #define __CONFIG_PXM2_H
16 16  
17 17 #define CONFIG_SIEMENS_PXM2
18   -#define MACH_TYPE_PXM2 4309
19 18 #define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_PXM2
20 19  
21 20 #include "siemens-am33x-common.h"
include/configs/rut.h
Diff comments   View file @ 92a1bab
... ... @@ -15,7 +15,6 @@
15 15 #define __CONFIG_RUT_H
16 16  
17 17 #define CONFIG_SIEMENS_RUT
18   -#define MACH_TYPE_RUT 4316
19 18 #define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_RUT
20 19  
21 20 #include "siemens-am33x-common.h"
include/configs/sc_sps_1.h
Diff comments   View file @ 92a1bab
... ... @@ -11,7 +11,6 @@
11 11  
12 12 /* System configuration */
13 13 #define CONFIG_MX28 /* i.MX28 SoC */
14   -#define MACH_TYPE_SC_SPS_1 4172
15 14 #define CONFIG_MACH_TYPE MACH_TYPE_SC_SPS_1
16 15  
17 16 /* U-Boot Commands */
include/configs/tao3530.h
Diff comments   View file @ 92a1bab
... ... @@ -24,8 +24,6 @@
24 24 #define CONFIG_ARM_ERRATA_430973
25 25 #define CONFIG_ARM_ERRATA_621766
26 26  
27   -#define MACH_TYPE_OMAP3_TAO3530 2836
28   -
29 27 #define CONFIG_SDRC /* Has an SDRC controller */
30 28  
31 29 #include <asm/arch/cpu.h> /* get chip and board defs */
include/configs/trats.h
Diff comments   View file @ 92a1bab
... ... @@ -40,10 +40,6 @@
40 40 #define CONFIG_SERIAL2
41 41 #define CONFIG_BAUDRATE 115200
42 42  
43   -/* Console configuration */
44   -
45   -/* MACH_TYPE_TRATS macro will be removed once added to mach-types */
46   -#define MACH_TYPE_TRATS 3928
47 43 #define CONFIG_MACH_TYPE MACH_TYPE_TRATS
48 44  
49 45 #define CONFIG_BOOTARGS "Please use defined boot"
include/configs/twister.h
Diff comments   View file @ 92a1bab
... ... @@ -14,7 +14,6 @@
14 14  
15 15 #include "tam3517-common.h"
16 16  
17   -#define MACH_TYPE_TAM3517 2818
18 17 #define CONFIG_MACH_TYPE MACH_TYPE_TAM3517
19 18  
20 19 #define CONFIG_TAM3517_SW3_SETTINGS
include/configs/wandboard.h
Diff comments   View file @ 92a1bab
... ... @@ -14,8 +14,7 @@
14 14  
15 15 #include "imx6_spl.h"
16 16  
17   -#define MACH_TYPE_WANDBOARD 4412
18   -#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD
  17 +#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD_IMX6
19 18  
20 19 /* Size of malloc() pool */
21 20 #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
include/configs/woodburn_common.h
Diff comments   View file @ 92a1bab
... ... @@ -20,11 +20,6 @@
20 20  
21 21 #define CONFIG_SYS_DCACHE_OFF
22 22  
23   -/* Only in case the value is not present in mach-types.h */
24   -#ifndef MACH_TYPE_FLEA3
25   -#define MACH_TYPE_FLEA3 3668
26   -#endif
27   -
28 23 #define CONFIG_MACH_TYPE MACH_TYPE_FLEA3
29 24  
30 25 /* This is required to setup the ESDC controller */