arm: Remove unregister MACH_TYPE_xxx uses
Before we can sync with the latest mach-types.h file from the Linux Kernel we need to remove some instances of MACH_TYPE_xxx from our sources. As these values have been removed from the canonical upstream source we should not be using them either, so drop. Cc: Tom Warren <twarren@nvidia.com> Cc: Lucas Stach <dev@lynxeye.de> Cc: Luka Perkov <luka@openwrt.org> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Heiko Schocher <hs@denx.de> Cc: Thomas Weber <weber@corscience.de> Cc: Lucile Quirion <lucile.quirion@savoirfairelinux.com> Cc: Matthias Weisser <weisserm@arcor.de> Cc: Suriyan Ramasami <suriyan.r@gmail.com> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Cc: Bo Shen <voice.shen@atmel.com> Cc: Nick Thompson <nick.thompson@gefanuc.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Erik van Luijk <evanluijk@interact.nl> Cc: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
d5324e2fb6
commit
70b26cd057
@ -92,11 +92,6 @@ int board_early_init_f(void)
|
||||
|
||||
int board_init(void)
|
||||
{
|
||||
/*
|
||||
* arch number of board
|
||||
*/
|
||||
gd->bd->bi_arch_number = MACH_TYPE_GOFLEXHOME;
|
||||
|
||||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100;
|
||||
|
||||
|
@ -271,8 +271,6 @@ int board_early_init_f(void)
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
int board_init(void)
|
||||
{
|
||||
/* board id for linux */
|
||||
gd->bd->bi_arch_number = MACH_TYPE_ARMADILLO_800EVA;
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = ARMADILLO_800EVA_SDRAM_BASE + 0x100;
|
||||
|
||||
|
@ -256,9 +256,6 @@ int board_early_init_f(void)
|
||||
|
||||
int board_init(void)
|
||||
{
|
||||
/* arch number of AT91SAM9X5EK-Board */
|
||||
gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9X5EK;
|
||||
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
|
@ -175,9 +175,6 @@ int board_init(void)
|
||||
irq_init();
|
||||
#endif
|
||||
|
||||
/* arch number of the board */
|
||||
gd->bd->bi_arch_number = MACH_TYPE_OMAPL138_LCDK;
|
||||
|
||||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR;
|
||||
|
||||
|
@ -277,9 +277,6 @@ int overwrite_console(void)
|
||||
|
||||
int board_init(void)
|
||||
{
|
||||
/* arch number of the board */
|
||||
gd->bd->bi_arch_number = MACH_TYPE_EA20;
|
||||
|
||||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR;
|
||||
|
||||
|
@ -252,8 +252,6 @@ int board_early_init_f(void)
|
||||
|
||||
int board_init(void)
|
||||
{
|
||||
gd->bd->bi_arch_number = MACH_TYPE_PICOSAM9G45;
|
||||
|
||||
/* adress of boot parameters */
|
||||
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
|
||||
|
||||
|
@ -138,7 +138,6 @@ int usb_gadget_handle_interrupts(int index)
|
||||
int board_init(void)
|
||||
{
|
||||
gpmc_init();
|
||||
gd->bd->bi_arch_number = MACH_TYPE_OMAP5_SEVM;
|
||||
gd->bd->bi_boot_params = (0x80000000 + 0x100); /* boot param addr */
|
||||
|
||||
tca642x_set_inital_state(CONFIG_SYS_I2C_TCA642X_ADDR, tca642x_init);
|
||||
|
@ -25,8 +25,6 @@
|
||||
#define CONFIG_TEGRA_ENABLE_UARTA
|
||||
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
|
||||
|
||||
#define CONFIG_MACH_TYPE MACH_TYPE_CARDHU
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_I2C_TEGRA
|
||||
|
||||
|
@ -21,8 +21,6 @@
|
||||
#define CONFIG_TEGRA_UARTA_SDIO1
|
||||
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
|
||||
|
||||
#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_T20
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_I2C_TEGRA
|
||||
|
||||
|
@ -16,11 +16,6 @@
|
||||
#define CONFIG_KW88F6281 /* SOC Name */
|
||||
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
|
||||
|
||||
/*
|
||||
* Machine type
|
||||
*/
|
||||
#define CONFIG_MACH_TYPE MACH_TYPE_ICONNECT
|
||||
|
||||
/*
|
||||
* Compression configuration
|
||||
*/
|
||||
|
@ -24,21 +24,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_NR_DRAM_BANKS 1
|
||||
#define CONFIG_SYS_SDRAM_BASE 0x00000000
|
||||
|
@ -52,7 +52,6 @@
|
||||
#define CONFIG_SYS_MAXARGS 32
|
||||
|
||||
/* setting board specific options */
|
||||
#define CONFIG_MACH_TYPE MACH_TYPE_SMARTWEB
|
||||
#define CONFIG_AUTO_COMPLETE
|
||||
#define CONFIG_ENV_OVERWRITE 1 /* Overwrite ethaddr / serial# */
|
||||
#define CONFIG_AUTO_COMPLETE
|
||||
|
@ -24,7 +24,6 @@
|
||||
#define CONFIG_ARM_ERRATA_430973
|
||||
#define CONFIG_ARM_ERRATA_621766
|
||||
|
||||
#define CONFIG_MACH_TYPE MACH_TYPE_TRICORDER
|
||||
/*
|
||||
* 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
|
||||
* 64 bytes before this address should be set aside for u-boot.img's
|
||||
|
@ -21,8 +21,6 @@
|
||||
|
||||
#define CONFIG_HW_WATCHDOG
|
||||
|
||||
#define CONFIG_MACH_TYPE MACH_TYPE_TS48XX
|
||||
|
||||
/* text base address used when linking */
|
||||
#define CONFIG_SYS_TEXT_BASE 0x90008000
|
||||
|
||||
|
@ -18,8 +18,6 @@
|
||||
#define CONFIG_TEGRA_ENABLE_UARTD
|
||||
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
|
||||
|
||||
#define CONFIG_MACH_TYPE MACH_TYPE_VENTANA
|
||||
|
||||
/* SD/MMC */
|
||||
#define CONFIG_GENERIC_MMC
|
||||
|
||||
|
@ -19,8 +19,6 @@
|
||||
#define CONFIG_TEGRA_UARTA_UAA_UAB
|
||||
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
|
||||
|
||||
#define CONFIG_MACH_TYPE MACH_TYPE_WHISTLER
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_I2C_TEGRA
|
||||
|
||||
|
@ -19,7 +19,6 @@
|
||||
#define CONFIG_SYS_TIMER_COUNTER \
|
||||
(&((struct gpt_regs *)IMX_GPT1_BASE)->counter)
|
||||
|
||||
#define CONFIG_MACH_TYPE MACH_TYPE_ZMX25
|
||||
/*
|
||||
* Environment settings
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user