X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fkm%2Fkm_arm.h;h=0de83f6723c5126c599453bff8196b4ea2e271d9;hb=9450ab2ba8d720bd9f73bccc0af2e2b5a2c2aaf1;hp=0c5f6e75154338c91298b8ca20f487998a4990de;hpb=3bd25cb512b912e9c8e9074467e730a73f87371d;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 0c5f6e7..0de83f6 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2009 * Marvell Semiconductor @@ -8,8 +9,6 @@ * * (C) Copyright 2010-2011 * Heiko Schocher, DENX Software Engineering, hs@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* @@ -23,21 +22,16 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_MARVELL #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #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 /* include common defines/options for all Keymile boards */ #include "keymile-common.h" -#define CONFIG_CMD_NAND - /* SPI NOR Flash default params, used by sf commands */ #define CONFIG_SF_DEFAULT_SPEED 8100000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 @@ -54,7 +48,6 @@ #include "asm/arch/config.h" -#define CONFIG_SYS_TEXT_BASE 0x07d00000 /* code address before reloc */ #define CONFIG_SYS_MEMTEST_START 0x00400000 /* 4M */ #define CONFIG_SYS_MEMTEST_END 0x007fffff /*(_8M -1) */ #define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */ @@ -74,7 +67,7 @@ " boardid=0x${IVM_BoardId} hwkey=0x${IVM_HWKey}" #define CONFIG_KM_DEF_ENV_CPU \ - "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.kwb\0" \ + "u-boot="CONFIG_HOSTNAME "/u-boot.kwb\0" \ CONFIG_KM_UPDATE_UBOOT \ "set_fdthigh=setenv fdt_high ${kernelmem}\0" \ "checkfdt=" \ @@ -86,7 +79,6 @@ "" #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#define CONFIG_MISC_INIT_R /* * NS16550 Configuration @@ -103,8 +95,6 @@ * for your console driver. */ -#define CONFIG_CONS_INDEX 1 /* Console on UART0 */ - /* * For booting Linux, the board info and command line data * have to be in the first 8 MB of memory, since this is @@ -116,11 +106,6 @@ #define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */ /* - * Commands configuration - */ -#define CONFIG_CMD_MTDPARTS - -/* * NAND Flash configuration */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 @@ -138,15 +123,12 @@ * Other required minimal configurations */ #define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ -#define CONFIG_NR_DRAM_BANKS 4 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ /* * Ethernet Driver configuration */ #define CONFIG_NETCONSOLE /* include NetConsole support */ -#define CONFIG_MII /* expose smi ove miiphy interface */ -#define CONFIG_MVGBE /* Enable Marvell Gbe Controller Driver */ #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* detect link using phy */ #define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 @@ -154,11 +136,6 @@ #define CONFIG_KM_COMMON_ETH_INIT /* standard km ethernet_present for piggy */ /* - * UBI related stuff - */ -#define CONFIG_SYS_USE_UBI - -/* * I2C related stuff */ #undef CONFIG_I2C_MVTWSI @@ -214,7 +191,6 @@ int get_scl(void); * Environment variables configurations */ #if defined CONFIG_KM_ENV_IS_IN_SPI_NOR -#define CONFIG_ENV_IS_IN_SPI_FLASH /* use SPI-Flash for environment vars */ #define CONFIG_ENV_OFFSET 0xc0000 /* no bracets! */ #define CONFIG_ENV_SIZE 0x02000 /* Size of Environment */ #define CONFIG_ENV_SECT_SIZE 0x10000 @@ -222,7 +198,6 @@ int get_scl(void); CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_TOTAL_SIZE 0x20000 /* no bracets! */ #else -#define CONFIG_ENV_IS_IN_EEPROM /* use EEPROM for environment vars */ #define CONFIG_SYS_DEF_EEPROM_ADDR 0x50 #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_EEPROM_WREN @@ -242,16 +217,6 @@ int get_scl(void); #define FLASH_GPIO_PIN 0x00010000 #define KM_FLASH_GPIO_PIN 16 -#ifndef MTDIDS_DEFAULT -# define MTDIDS_DEFAULT "nand0=orion_nand" -#endif /* MTDIDS_DEFAULT */ - -#ifndef MTDPARTS_DEFAULT -# define MTDPARTS_DEFAULT "mtdparts=" \ - "orion_nand:" \ - "-(" CONFIG_KM_UBI_PARTITION_NAME_BOOT ");" -#endif /* MTDPARTS_DEFAULT */ - #define CONFIG_KM_UPDATE_UBOOT \ "update=" \ "sf probe 0;sf erase 0 +${filesize};" \ @@ -288,7 +253,6 @@ int get_scl(void); "" #if !defined(CONFIG_MTD_NOR_FLASH) -#undef CONFIG_FLASH_CFI_MTD #undef CONFIG_JFFS2_CMDLINE #endif @@ -303,8 +267,6 @@ int get_scl(void); #define CONFIG_KM_RESERVED_PRAM 0x801000 /* address for the bootcount (taken from end of RAM) */ #define BOOTCOUNT_ADDR (CONFIG_KM_RESERVED_PRAM) -/* Use generic bootcount RAM driver */ -#define CONFIG_BOOTCOUNT_RAM /* enable POST tests */ #define CONFIG_POST (CONFIG_SYS_POST_MEM_REGIONS)