sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Tom Rini 2017-01-25 20:42:36 -05:00
parent 94ba26f2bc
commit 92a1babf75
45 changed files with 12 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/Marvell/gplugd/gplugd.c
View File

@ -76,7 +76,7 @@ int board_init(void)
(struct armd1apb2_registers *)ARMD1_APBC2_BASE;
/* arch number of Board */
gd->bd->bi_arch_number = MACH_TYPE_SHEEVAD;
gd->bd->bi_arch_number = MACH_TYPE_GPLUGD;
/* adress of boot parameters */
gd->bd->bi_boot_params = armd1_sdram_base(0) + 0x100;
/* Assert PHY_RST# */

2
board/Seagate/nas220/nas220.c
View File

@ -75,7 +75,7 @@ int board_init(void)
/*
* arch number of board
*/
gd->bd->bi_arch_number = MACH_TYPE_NAS220;
gd->bd->bi_arch_number = MACH_TYPE_RD88F6192_NAS;
/* adress of boot parameters */
gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100;

2
board/gumstix/duovero/duovero.c
View File

@ -47,7 +47,7 @@ int board_init(void)
{
gpmc_init();
gd->bd->bi_arch_number = MACH_TYPE_OMAP4_DUOVERO;
gd->bd->bi_arch_number = MACH_TYPE_DUOVERO;
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
return 0;

3
include/configs/am335x_evm.h
View File

@ -26,8 +26,7 @@
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */
#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM
#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM
/* Clock Defines */
#define V_OSCK 24000000 /* Clock output from T2 */

1
include/configs/am335x_igep0033.h
View File

@ -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 */

1
include/configs/apx4devkit.h
View File

@ -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 */

3
include/configs/baltos.h
View File

@ -19,8 +19,7 @@
#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
#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM
/* Clock Defines */
#define V_OSCK 24000000 /* Clock output from T2 */

3
include/configs/bav335x.h
View File

@ -29,8 +29,7 @@
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */
#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM
#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM
/* Clock Defines */
#define V_OSCK 24000000 /* Clock output from T2 */

1
include/configs/beaver.h
View File

@ -21,7 +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 */

1
include/configs/calimain.h
View File

@ -16,7 +16,6 @@
* Board
*/
#define CONFIG_DRIVER_TI_EMAC
#define MACH_TYPE_CALIMAIN 3528
#define CONFIG_MACH_TYPE MACH_TYPE_CALIMAIN
/*

1
include/configs/cm_t335.h
View File

@ -24,7 +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 */

2
include/configs/dalmore.h
View File

@ -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

4
include/configs/devkit3250.h
View File

@ -13,10 +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

1
include/configs/dns325.h
View File

@ -16,7 +16,6 @@
/*
* Machine number definition
*/
#define MACH_TYPE_DNS325 3800
#define CONFIG_MACH_TYPE MACH_TYPE_DNS325
/*

1
include/configs/draco.h
View File

@ -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"

13
include/configs/dreamplug.h
View File

@ -12,19 +12,6 @@
#ifndef _CONFIG_DREAMPLUG_H
#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)
*/

3
include/configs/duovero.h
View File

@ -16,8 +16,7 @@
* 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
#define CONFIG_MACH_TYPE MACH_TYPE_DUOVERO
#include <configs/ti_omap4_common.h>

1
include/configs/eco5pk.h
View File

@ -28,7 +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"

1
include/configs/ethernut5.h
View File

@ -19,7 +19,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT
/* Set our official architecture number. */
#define MACH_TYPE_ETHERNUT5 1971
#define CONFIG_MACH_TYPE MACH_TYPE_ETHERNUT5
/* CPU information */

2
include/configs/exynos5250-common.h
View File

@ -15,8 +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)

5
include/configs/flea3.h
View File

@ -20,11 +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 */

12
include/configs/gplugd.h
View File

@ -15,23 +15,13 @@
#ifndef __CONFIG_GPLUGD_H
#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_MACH_TYPE MACH_TYPE_GPLUGD /* Machine type */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
#define CONFIG_SYS_TEXT_BASE 0x00f00000

1
include/configs/h2200.h
View File

@ -9,7 +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

4
include/configs/km/km_arm.h
View File

@ -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)
*/

2
include/configs/lacie_kw.h
View File

@ -15,10 +15,8 @@
#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

1
include/configs/m28evk.h
View File

@ -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 */

1
include/configs/mcx.h
View File

@ -20,7 +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 */

8
include/configs/meesc.h
View File

@ -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 */

1
include/configs/mt_ventoux.h
View File

@ -19,7 +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"

3
include/configs/mx6slevk.h
View File

@ -15,8 +15,7 @@
#include "imx6_spl.h"
#endif
#define MACH_TYPE_MX6SLEVK 4307
#define CONFIG_MACH_TYPE MACH_TYPE_MX6SLEVK
#define CONFIG_MACH_TYPE MACH_TYPE_MX6SL_EVK
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)

5
include/configs/nas220.h
View File

@ -13,10 +13,9 @@
#define _CONFIG_NAS220_H
/*
* Machine type definition and ID
* Machine type ID
*/
#define MACH_TYPE_NAS220 MACH_TYPE_RD88F6192_NAS
#define CONFIG_MACH_TYPE MACH_TYPE_NAS220
#define CONFIG_MACH_TYPE MACH_TYPE_RD88F6192_NAS
/*
* High Level Configuration Options (easy to change)

1
include/configs/pcm051.h
View File

@ -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 */

1
include/configs/pepper.h
View File

@ -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 */

1
include/configs/pm9261.h
View File

@ -31,7 +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 */

1
include/configs/pm9263.h
View File

@ -31,7 +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 */

1
include/configs/pm9g45.h
View File

@ -25,7 +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 */

1
include/configs/pogo_e02.h
View File

@ -16,7 +16,6 @@
/*
* Machine type definition and ID
*/
#define MACH_TYPE_POGO_E02 3542
#define CONFIG_MACH_TYPE MACH_TYPE_POGO_E02
/*

1
include/configs/pxm2.h
View File

@ -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"

1
include/configs/rut.h
View File

@ -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"

1
include/configs/sc_sps_1.h
View File

@ -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 */

2
include/configs/tao3530.h
View File

@ -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 */

4
include/configs/trats.h
View File

@ -40,10 +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"

1
include/configs/twister.h
View File

@ -14,7 +14,6 @@
#include "tam3517-common.h"
#define MACH_TYPE_TAM3517 2818
#define CONFIG_MACH_TYPE MACH_TYPE_TAM3517
#define CONFIG_TAM3517_SW3_SETTINGS

3
include/configs/wandboard.h
View File

@ -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)

5
include/configs/woodburn_common.h
View File

@ -20,11 +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 */