From b8232ca19c213d993b2097330bcb5a091e556569 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Wed, 4 Mar 2015 19:53:55 +0100 Subject: [PATCH] micro: move more config stuff into common.h --- u-boot/include/configs/carambola2.h | 46 ----------------------------- u-boot/include/configs/common.h | 45 +++++++++++++++++++++++++++- u-boot/include/configs/skylab.h | 46 ----------------------------- 3 files changed, 44 insertions(+), 93 deletions(-) diff --git a/u-boot/include/configs/carambola2.h b/u-boot/include/configs/carambola2.h index 11740da963..2ea5024d15 100644 --- a/u-boot/include/configs/carambola2.h +++ b/u-boot/include/configs/carambola2.h @@ -69,52 +69,6 @@ #include -/* - * timeout values are in ticks - */ -#define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */ -#define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */ - -/* - * Cache lock for stack - */ -#define CFG_INIT_SP_OFFSET 0x1000 - -#ifndef COMPRESSED_UBOOT -#define CFG_ENV_IS_IN_FLASH 1 -#undef CFG_ENV_IS_NOWHERE -#else -#undef CFG_ENV_IS_IN_FLASH -#define CFG_ENV_IS_NOWHERE 1 -#endif /* #ifndef COMPRESSED_UBOOT */ - -/* Address and size of Primary Environment Sector */ -#define CFG_ENV_ADDR 0x9f040000 -#define CFG_ENV_SIZE 0x10000 - -#define CONFIG_BOOTCOMMAND "bootm 0x9f050000" - -#define CONFIG_NET_MULTI - -#define CONFIG_MEMSIZE_IN_BYTES - -#ifdef COMPRESSED_UBOOT -#define ATH_NO_PCI_INIT -#endif - -/*----------------------------------------------------------------------- - * Cache Configuration - */ -#ifndef COMPRESSED_UBOOT -#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_DHCP | CFG_CMD_ELF | CFG_CMD_PCI | \ - CFG_CMD_MII | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_ENV | \ - CFG_CMD_FLASH | CFG_CMD_LOADS | CFG_CMD_RUN | CFG_CMD_LOADB | CFG_CMD_ELF | CFG_CMD_ETHREG | CFG_CMD_FAT )) -#elif defined(VXWORKS_UBOOT) -#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII | CFG_CMD_ELF)) -#else -#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII)) -#endif /* #ifndef COMPRESSED_UBOOT */ - #define CFG_ATHRS26_PHY 1 #define CONFIG_IPADDR 192.168.2.100 diff --git a/u-boot/include/configs/common.h b/u-boot/include/configs/common.h index 65958eba5e..e3366a5dcb 100644 --- a/u-boot/include/configs/common.h +++ b/u-boot/include/configs/common.h @@ -1,6 +1,49 @@ -/* commands */ +/* + * timeout values are in ticks + */ +#define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */ +#define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */ +/* + * Cache lock for stack + */ +#define CFG_INIT_SP_OFFSET 0x1000 + +#ifndef COMPRESSED_UBOOT +#define CFG_ENV_IS_IN_FLASH 1 +#undef CFG_ENV_IS_NOWHERE +#else +#undef CFG_ENV_IS_IN_FLASH +#define CFG_ENV_IS_NOWHERE 1 +#endif /* #ifndef COMPRESSED_UBOOT */ + +/* Address and size of Primary Environment Sector */ +#define CFG_ENV_ADDR 0x9f040000 +#define CFG_ENV_SIZE 0x10000 + +#define CONFIG_BOOTCOMMAND "bootm 0x9f050000" + +#define CONFIG_NET_MULTI + +#define CONFIG_MEMSIZE_IN_BYTES + +#ifdef COMPRESSED_UBOOT +#define ATH_NO_PCI_INIT +#endif + +/*----------------------------------------------------------------------- + * Cache Configuration + */ +#ifndef COMPRESSED_UBOOT +#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_DHCP | CFG_CMD_ELF | CFG_CMD_PCI | \ + CFG_CMD_MII | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_ENV | \ + CFG_CMD_FLASH | CFG_CMD_LOADS | CFG_CMD_RUN | CFG_CMD_LOADB | CFG_CMD_ELF | CFG_CMD_ETHREG | CFG_CMD_FAT )) +#elif defined(VXWORKS_UBOOT) +#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII | CFG_CMD_ELF)) +#else +#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII)) +#endif /* #ifndef COMPRESSED_UBOOT */ /* platform specific */ diff --git a/u-boot/include/configs/skylab.h b/u-boot/include/configs/skylab.h index 9ff36ea04b..cc34453187 100644 --- a/u-boot/include/configs/skylab.h +++ b/u-boot/include/configs/skylab.h @@ -67,52 +67,6 @@ #include -/* - * timeout values are in ticks - */ -#define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */ -#define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */ - -/* - * Cache lock for stack - */ -#define CFG_INIT_SP_OFFSET 0x1000 - -#ifndef COMPRESSED_UBOOT -#define CFG_ENV_IS_IN_FLASH 1 -#undef CFG_ENV_IS_NOWHERE -#else -#undef CFG_ENV_IS_IN_FLASH -#define CFG_ENV_IS_NOWHERE 1 -#endif /* #ifndef COMPRESSED_UBOOT */ - -/* Address and size of Primary Environment Sector */ -#define CFG_ENV_ADDR 0x9f040000 -#define CFG_ENV_SIZE 0x10000 - -#define CONFIG_BOOTCOMMAND "bootm 0x9f050000" - -#define CONFIG_NET_MULTI - -#define CONFIG_MEMSIZE_IN_BYTES - -#ifdef COMPRESSED_UBOOT -#define ATH_NO_PCI_INIT -#endif - -/*----------------------------------------------------------------------- - * Cache Configuration - */ -#ifndef COMPRESSED_UBOOT -#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_DHCP | CFG_CMD_ELF | CFG_CMD_PCI | \ - CFG_CMD_MII | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_ENV | \ - CFG_CMD_FLASH | CFG_CMD_LOADS | CFG_CMD_RUN | CFG_CMD_LOADB | CFG_CMD_ELF | CFG_CMD_ETHREG | CFG_CMD_FAT )) -#elif defined(VXWORKS_UBOOT) -#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII | CFG_CMD_ELF)) -#else -#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII)) -#endif /* #ifndef COMPRESSED_UBOOT */ - #define CFG_ATHRS26_PHY 1 #define CONFIG_IPADDR 192.168.2.100