powerpc: common updates for keymile boards
PATCH 1/3 powerpc: common updates for keymile boards
- added to keymile-common.h:
- bootcount support for kmeter1
- COMMAND HISTORY
- CONFIG_AUTO_COMPLETE
- CONFIG_SYS_FLASH_PROTECTION
- JFFS2 support
- extracted common I2C settings for all boards
- common default environment settings summarized
--- include/configs/keymile-common.h | 150 +++++++++++++++++++++++++++++++++++++- include/configs/kmeter1.h | 52 ++----------- include/configs/mgcoge.h | 65 ++++------------ include/configs/mgsuvd.h | 59 ++++----------- 4 files changed, 187 insertions(+), 139 deletions(-)
include/configs/keymile-common.h +147 -3
@@ -27,9 +27,7 @@/* Do boardspecific init for all boards */ #define CONFIG_BOARD_EARLY_INIT_R 1 -#if defined(CONFIG_MGCOGE ) || defined(CONFIG_MGSUVD )#define CONFIG_BOOTCOUNT_LIMIT -#endif /* * Command line configuration.
@@ -45,10 +43,11 @@#define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C +#define CONFIG_CMD_JFFS2 +#define CONFIG_JFFS2_CMDLINE #undef CONFIG_WATCHDOG/* disable platform specific watchdog */ -#define CONFIG_BOOTCOMMAND "run net_nfs"#define CONFIG_BOOTDELAY 5/* autoboot after 5 seconds */ #undef CONFIG_BOOTARGS/* the boot command will set bootargs */
@@ -68,6 +67,8 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ #define CONFIG_CMDLINE_EDITING 1/* add command line history */ +#define CONFIG_COMMAND_HISTORY 1 +#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ #define CONFIG_HUSH_INIT_VAR 1
@@ -95,6 +96,25 @@#define CONFIG_SYS_SLOT_ID_OFF (0x07)/* register offset */ #define CONFIG_SYS_SLOT_ID_MASK (0x3f)/* mask for slot ID bits */ +#define CONFIG_I2C_MULTI_BUS 1 +#define CONFIG_I2C_CMD_TREE 1 +#define CONFIG_SYS_MAX_I2C_BUS 2 +#define CONFIG_SYS_I2C_INIT_BOARD 1 +#define CONFIG_I2C_MUX 1 + +/* EEprom support */ +#define CONFIG_SYS_I2C_MULTI_EEPROMS 1 +#define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE +#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 +#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 + +/* Support the IVM EEprom */ +#define CONFIG_SYS_IVM_EEPROM_ADR 0x50 +#define CONFIG_SYS_IVM_EEPROM_MAX_LEN 0x400 +#define CONFIG_SYS_IVM_EEPROM_PAGE_LEN 0x100 + +#define CONFIG_SYS_FLASH_PROTECTION 1 +/* * BOOTP options */
@@ -103,4 +123,128 @@#define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME +/* define this to use the keymile's io muxing feature */ +/*#define CONFIG_IO_MUXING */ + +#ifdef CONFIG_IO_MUXING +#define CONFIG_KM_DEF_ENV_IOMUX \ + "nc=setenv ethact HDLC ETHERNET \0" \ + "nce=setenv ethact SCC ETHERNET \0" \ + "stderr=serial,nc \0" \ + "stdin=serial,nc \0" \ + "stdout=serial,nc \0" \ + "tftpsrcp=69 \0" \ + "tftpdstp=69 \0" +#else +#define CONFIG_KM_DEF_ENV_IOMUX \ + "stderr=serial \0" \ + "stdin=serial \0" \ + "stdout=serial \0" +#endif + +#ifndef CONFIG_KM_DEF_ENV_PRIVATE +#define CONFIG_KM_DEF_ENV_PRIVATE \ + "kmprivate=empty\0" +#endif + +#define xstr (s) str(s) +#define str (s) #s + +#ifndef CONFIG_KM_DEF_ENV +#define CONFIG_KM_DEF_ENV \ + "netdev=eth0\0" \ + "u-boot_addr_r=100000\0" \ + "kernel_addr_r=200000\0" \ + "fdt_addr_r=600000\0" \ + "ram_ws=800000 \0" \ + "autoscr_ws=780000 \0" \ + "fdt_file=" xstr(CONFIG_HOSTNAME) "/" \ + xstr(CONFIG_HOSTNAME) ".dtb\0" \ + "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.bin \0" \ + "kernel_file=" xstr(CONFIG_HOSTNAME) "/uImage \0" \ + "load=tftp ${u-boot_addr_r} ${u-boot}\0" \ + "update=protect off " xstr(BOOTFLASH_START) " +${filesize};" \ + "erase " xstr(BOOTFLASH_START) " +${filesize};" \ + "cp.b ${u-boot_addr_r} " xstr(BOOTFLASH_START) \ + " ${filesize};" \ + "protect on " xstr(BOOTFLASH_START) " +${filesize}\0" \ + "load_fdt=tftp ${fdt_addr_r} ${fdt_file}; " \ + "setenv actual_fdt_addr ${fdt_addr_r} \0" \ + "load_kernel=tftp ${kernel_addr_r} ${kernel_file}; " \ + "setenv actual_kernel_addr ${kernel_addr_r} \0" \ + "ramargs=setenv bootargs root=/dev/ram rw\0" \ + "nfsargs=setenv bootargs root=/dev/nfs rw " \ + "nfsroot=${serverip}:${rootpath}\0" \ + "mtdargs=setenv bootargs root=${actual_rootfs} rw " \ + "rootfstype=jffs2 \0" \ + "altmtdargs=setenv bootargs root=${backup_rootfs} rw " \ + "rootfstype=jffs2 \0" \ + "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \ + "addip=setenv bootargs ${bootargs} " \ + "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ + ":${hostname}:${netdev}:off panic=1\0" \ + "addboardid=setenv bootargs ${bootargs} " \ + "hwKey=${IVM_HWKey} boardId=0x${IVM_BoardId} \0" \ + "addpram=setenv bootargs ${bootargs} " \ + "mem=${mem} pram=${pram}\0" \ + "pram=" xstr(CONFIG_PRAM) "k\0" \ + "net_nfs=tftp ${kernel_addr_r} ${kernel_file}; " \ + "tftp ${fdt_addr_r} ${fdt_file}; " \ + "run nfsargs addip addcon addboardid addpram;" \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "net_self=tftp ${kernel_addr_r} ${kernel_file}; " \ + "tftp ${fdt_addr_r} ${fdt_file}; " \ + "tftp ${ramdisk_addr} ${ramdisk_file}; " \ + "run ramargs addip addboardid addpram; " \ + "bootm ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r}\0"\ + "flash_nfs=run nfsargs addip addcon;" \ + "bootm ${kernel_addr} - ${fdt_addr}\0" \ + "flash_self=run ramargs addip addcon addboardid addpram;" \ + "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \ + "bootcmd=run mtdargs addip addcon addboardid addpram; " \ + "bootm ${actual_kernel_addr} - ${actual_fdt_addr} \0" \ + "altbootcmd=run altmtdargs addip addcon addboardid addpram; " \ + "bootm ${backup_kernel_addr} - ${backup_fdt_addr} \0" \ + "actual0=setenv actual_bank 0; setenv actual_kernel_addr " \ + "${bank0_kernel_addr}; " \ + "setenv actual_fdt_addr ${bank0_fdt_addr}; " \ + "setenv actual_rootfs ${bank0_rootfs} \0" \ + "actual1=setenv actual_bank 1; setenv actual_kernel_addr " \ + "${bank1_kernel_addr}; " \ + "setenv actual_fdt_addr ${bank1_fdt_addr}; " \ + "setenv actual_rootfs ${bank1_rootfs} \0" \ + "backup0=setenv backup_bank 0; setenv backup_kernel_addr " \ + "${bank0_kernel_addr}; " \ + "setenv backup_fdt_addr ${bank0_fdt_addr}; " \ + "setenv backup_rootfs ${bank0_rootfs} \0" \ + "backup1=setenv backup_bank 1; setenv backup_kernel_addr " \ + "${bank1_kernel_addr}; " \ + "setenv backup_fdt_addr ${bank1_fdt_addr}; " \ + "setenv backup_rootfs ${bank1_rootfs} \0" \ + "setbank0=run actual0 backup1 \0" \ + "setbank1=run actual1 backup0 \0" \ + "release=setenv bootcmd " \ + "\'run mtdargs addip addcon addboardid addpram;" \ + "bootm ${actual_kernel_addr} - ${actual_fdt_addr} \'; " \ + "saveenv \0" \ + "develop=setenv bootcmd " \ + "\'run nfsargs addip addcon addboardid addpram;" \ + "bootm ${actual_kernel_addr} - ${actual_fdt_addr} \'; " \ + "saveenv \0" \ + "developall=setenv bootcmd " \ + "\'run load_fdt load_kernel nfsargs " \ + "addip addcon addboardid addpram; " \ + "bootm ${actual_kernel_addr} - ${actual_fdt_addr} \'; " \ + "saveenv \0" \ + "set_new_esw_script=setenv new_esw_script " \ + "new_esw_0x${IVM_BoardId}_0x${IVM_HWKey}.scr \0" \ + "new_esw=run set_new_esw_script; " \ + "tftp ${autoscr_ws} ${new_esw_script}; " \ + "iminfo ${autoscr_ws}; autoscr ${autoscr_ws} \0" \ + "bootlimit=0 \0" \ + CONFIG_KM_DEF_ENV_IOMUX \ + CONFIG_KM_DEF_ENV_PRIVATE \ + "" +#endif /* CONFIG_KM_DEF_ENV */ +#endif /* __CONFIG_KEYMILE_H */
include/configs/kmeter1.h +7 -45
75 lines not on this page · raw message
include/configs/mgcoge.h +16 -49
86 lines not on this page · raw message
include/configs/mgsuvd.h +17 -42
72 lines not on this page · raw message
Signature · 5 lines
1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 1/3 powerpc: common updates for keymile boards
Quoted 2 lines · On Wed, 11 Mar 2009 09:04:39 +0100 Heiko Schocher <[email protected]> wrote:
- added to
keymile-common.h:
- bootcount support for kmeter1
I don't see this.
include/configs/kmeter1.h line 36
Quoted 9 lines
include/configs/kmeter1.h +1
-0@@ -33,6 +33,7 @@/* include common defines/options for all Keymile boards */ #include "keymile-common.h" +#undef CONFIG_SYS_I2C_INIT_BOARD
personally, I'd favour setting this in the individual board configs, rather than #defining and then #undefing it in the less common case. But they're your boards, and thus ultimately your call.
Kim
PATCH 1/3 powerpc: common updates for keymile boards
Hello Kim,
Quoted 7 lines · Kim Phillips
Quoted 2 lines · On Wed, 11 Mar 2009 09:04:39 +0100 Heiko Schocher <[email protected]> wrote:
- added to
keymile-common.h:
- bootcount support for kmeter1I don't see this.
include/configs/keymile-common.h +0 -2
@@ -27,9 +27,7 @@/* Do boardspecific init for all boards */ #define CONFIG_BOARD_EARLY_INIT_R 1 -#if defined(CONFIG_MGCOGE ) || defined(CONFIG_MGSUVD )#define CONFIG_BOOTCOUNT_LIMIT -#endif /* * Command line configuration.
with deleting the "-#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD)" line it is also activated for the kmeter1
Quoted 8 lines
Quoted 8 lines
include/configs/kmeter1.h +0
-0@@ -33,6 +33,7 @@/* include common defines/options for all Keymile boards */ #include "keymile-common.h"
Quoted 5 lines
include/configs/kmeter1.h line 36
Quoted 1 line
include/configs/kmeter1.h +1
-0+#undef CONFIG_SYS_I2C_INIT_BOARDpersonally, I'd favour setting this in the individual board configs, rather than #defining and then #undefing it in the less common case. But they're your boards, and thus ultimately your call.
The "#undef CONFIG_SYS_I2C_INIT_BOARD" will go away in the next release after 2009.03 (hopefully) so it is again a common option for all keymile boards. But because it is a new feature for fsl_i2c I post it in the next merge window.
bye
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 1/3 powerpc: common updates for keymile boards
Quoted 10 lines · On Wed, 11 Mar 2009 19:38:15 +0100 Heiko Schocher <[email protected]> wrote:
include/configs/keymile-common.h +0
-2@@ -27,9 +27,7 @@/* Do boardspecific init for all boards */ #define CONFIG_BOARD_EARLY_INIT_R 1 -#if defined(CONFIG_MGCOGE ) || defined(CONFIG_MGSUVD )#define CONFIG_BOOTCOUNT_LIMIT -#endif /* * Command line configuration.
Quoted 2 lines
with deleting the "-#if
defined(CONFIG_MGCOGE)||defined(CONFIG_MGSUVD)" line it is also activated for the kmeter1
thanks, I see it now ;)
Quoted 4 lines
The "#undef
CONFIG_SYS_I2C_INIT_BOARD" will go away in the next release after 2009.03 (hopefully) so it is again a common option for all keymile boards. But because it is a new feature forfsl_i2cI post it in the next merge window.
ok thanks,
Kim