X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=blobdiff_plain;f=include%2Fconfigs%2Fkm%2Fkm_arm.h;h=cc36a68c0b0f156460aa34ba30ecf5bfdca684e7;hp=15fca1abe614dd13cf38de6bbf27f9501e952621;hb=ff5410d34b1ce3fa3785ecfd785704cfccc30938;hpb=1254ff97abb7606ccd0d7bdcd9f22581c50fe535 diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 15fca1abe6..cc36a68c0b 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -20,30 +20,20 @@ #ifndef _CONFIG_KM_ARM_H #define _CONFIG_KM_ARM_H -#define CONFIG_SYS_GENERIC_BOARD - -/* We got removed from Linux mach-types.h */ -#define MACH_TYPE_KM_KIRKWOOD 2255 - /* * 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 -#define CONFIG_CMD_SF - /* SPI NOR Flash default params, used by sf commands */ #define CONFIG_SF_DEFAULT_SPEED 8100000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 @@ -60,7 +50,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 */ @@ -83,18 +72,20 @@ "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.kwb\0" \ CONFIG_KM_UPDATE_UBOOT \ "set_fdthigh=setenv fdt_high ${kernelmem}\0" \ + "checkfdt=" \ + "if cramfsls fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb; " \ + "then true; else setenv cramfsloadfdt true; " \ + "setenv boot bootm ${load_addr_r}; " \ + "echo No FDT found, booting with the kernel " \ + "appended one; fi\0" \ "" #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #define CONFIG_MISC_INIT_R -/* Pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT - /* * NS16550 Configuration */ -#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK @@ -119,17 +110,6 @@ #define CONFIG_INITRD_TAG /* enable INITRD tag */ #define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */ -/* - * Commands configuration - */ -#define CONFIG_CMD_ELF -#define CONFIG_CMD_MTDPARTS - -/* - * Without NOR FLASH we need this - */ -#define CONFIG_SYS_NO_FLASH - /* * NAND Flash configuration */ @@ -147,10 +127,7 @@ /* * Other required minimal configurations */ -#define CONFIG_CONSOLE_INFO_QUIET /* some code reduction */ #define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ -#define CONFIG_ARCH_MISC_INIT /* call arch_misc_init() */ -#define CONFIG_DISPLAY_CPUINFO /* Display cpu info */ #define CONFIG_NR_DRAM_BANKS 4 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ @@ -159,7 +136,6 @@ */ #define CONFIG_NETCONSOLE /* include NetConsole support */ #define CONFIG_MII /* expose smi ove miiphy interface */ -#define CONFIG_CMD_MII /* to debug mdio phy config */ #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 */ @@ -167,11 +143,6 @@ #define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ #define CONFIG_KM_COMMON_ETH_INIT /* standard km ethernet_present for piggy */ -/* - * UBI related stuff - */ -#define CONFIG_SYS_USE_UBI - /* * I2C related stuff */ @@ -217,7 +188,6 @@ int get_scl(void); #define CONFIG_SYS_I2C_SOFT_SPEED 100000 /* EEprom support 24C128, 24C256 valid for environment eeprom */ -#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6 /* 64 Byte write page */ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 @@ -229,7 +199,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 @@ -237,20 +206,18 @@ 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 #define CONFIG_ENV_OFFSET 0x0 /* no bracets! */ #define CONFIG_ENV_SIZE (0x2000 - CONFIG_ENV_OFFSET) -#define CONFIG_I2C_ENV_EEPROM_BUS KM_ENV_BUS +#define CONFIG_I2C_ENV_EEPROM_BUS 5 /* I2C2 (Mux-Port 5) */ #define CONFIG_ENV_OFFSET_REDUND 0x2000 /* no bracets! */ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_SPI_FLASH_STMICRO /* SPI bus claim MPP configuration */ #define CONFIG_SYS_KW_SPI_MPP 0x0 @@ -258,16 +225,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};" \ @@ -303,7 +260,7 @@ int get_scl(void); "arch=arm\0" \ "" -#if defined(CONFIG_SYS_NO_FLASH) +#if !defined(CONFIG_MTD_NOR_FLASH) #undef CONFIG_FLASH_CFI_MTD #undef CONFIG_JFFS2_CMDLINE #endif @@ -311,7 +268,6 @@ int get_scl(void); /* additions for new relocation code, must be added to all boards */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* Do early setups now in board_init_f() */ -#define CONFIG_BOARD_EARLY_INIT_F /* * resereved pram area at the end of memroy [hex] @@ -320,16 +276,12 @@ 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) #define CONFIG_POST_SKIP_ENV_FLAGS #define CONFIG_POST_EXTERNAL_WORD_FUNCS -#define CONFIG_CMD_DIAG /* we do the whole PCIe FPGA config stuff here */ -#define CONFIG_BOARD_LATE_INIT #endif /* _CONFIG_KM_ARM_H */