From: Michal Simek Date: Tue, 7 Aug 2007 20:12:05 +0000 (+0200) Subject: Merge git://www.denx.de/git/u-boot X-Git-Tag: v1.3.0-rc3~5^2~10 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=85fad497b3c2e99fa48d18351d2898cf8cdbe898 Merge git://www.denx.de/git/u-boot --- 85fad497b3c2e99fa48d18351d2898cf8cdbe898 diff --cc Makefile index 4a0e9f59d2,cf3fbcbf20..980aac2b6a --- a/Makefile +++ b/Makefile @@@ -206,9 -205,9 +206,10 @@@ LIBS += disk/libdisk. LIBS += rtc/librtc.a LIBS += dtt/libdtt.a LIBS += drivers/libdrivers.a + LIBS += drivers/bios_emulator/libatibiosemu.a LIBS += drivers/nand/libnand.a LIBS += drivers/nand_legacy/libnand_legacy.a +LIBS += drivers/net/libnetdrv.a ifeq ($(CPU),mpc83xx) LIBS += drivers/qe/qe.a endif diff --cc common/cmd_mfsl.c index 337dfbb24e,8d4c1a38d7..93cc873b05 --- a/common/cmd_mfsl.c +++ b/common/cmd_mfsl.c @@@ -409,10 -408,10 +409,10 @@@ U_BOOT_CMD (fwr, 4, 1, do_fwr " 3 - blocking control write\n"); U_BOOT_CMD (rspr, 3, 1, do_rspr, - "rmsr - read/write special purpose register\n", + "rspr - read/write special purpose register\n", "- reg_num [write value] read/write special purpose register\n" - " 0 - MSR - Machine status register\n" - " 1 - EAR - Exception address register\n" - " 2 - ESR - Exception status register\n"); + " 1 - MSR - Machine status register\n" + " 3 - EAR - Exception address register\n" + " 5 - ESR - Exception status register\n"); - #endif /* CONFIG_MICROBLAZE & CFG_CMD_MFSL */ + #endif diff --cc include/configs/ml401.h index 8b74b7c686,7eeae708a7..831929882a --- a/include/configs/ml401.h +++ b/include/configs/ml401.h @@@ -146,82 -145,50 +146,49 @@@ #define CFG_FLASH_PROTECTION /* hardware flash protection */ #endif /* !FLASH */ - #ifdef FLASH - #ifdef RAMENV - #define CONFIG_COMMANDS (CONFIG__CMD_DFL |\ - CFG_CMD_MEMORY |\ - CFG_CMD_MISC |\ - CFG_CMD_AUTOSCRIPT |\ - CFG_CMD_IRQ |\ - CFG_CMD_ASKENV |\ - CFG_CMD_BDI |\ - CFG_CMD_RUN |\ - CFG_CMD_LOADS |\ - CFG_CMD_LOADB |\ - CFG_CMD_IMI |\ - CFG_CMD_NET |\ - CFG_CMD_CACHE |\ - CFG_CMD_FAT |\ - CFG_CMD_EXT2 |\ - CFG_CMD_JFFS2 |\ - CFG_CMD_ECHO |\ - CFG_CMD_IMLS |\ - CFG_CMD_FLASH |\ - CFG_CMD_MFSL |\ - CFG_CMD_PING \ - ) - #else /* !RAMENV */ - #define CONFIG_COMMANDS (CONFIG__CMD_DFL |\ - CFG_CMD_MEMORY |\ - CFG_CMD_MISC |\ - CFG_CMD_AUTOSCRIPT |\ - CFG_CMD_IRQ |\ - CFG_CMD_ASKENV |\ - CFG_CMD_BDI |\ - CFG_CMD_RUN |\ - CFG_CMD_LOADS |\ - CFG_CMD_LOADB |\ - CFG_CMD_IMI |\ - CFG_CMD_NET |\ - CFG_CMD_CACHE |\ - CFG_CMD_IMLS |\ - CFG_CMD_FLASH |\ - CFG_CMD_PING |\ - CFG_CMD_ENV |\ - CFG_CMD_FAT |\ - CFG_CMD_EXT2 |\ - CFG_CMD_JFFS2 |\ - CFG_CMD_ECHO |\ - CFG_CMD_MFSL |\ - CFG_CMD_SAVES \ - ) + /* + * BOOTP options + */ + #define CONFIG_BOOTP_BOOTFILESIZE + #define CONFIG_BOOTP_BOOTPATH + #define CONFIG_BOOTP_GATEWAY + #define CONFIG_BOOTP_HOSTNAME - + /* + * Command line configuration. + */ + #include + + #define CONFIG_CMD_ASKENV + #define CONFIG_CMD_AUTOSCRIPT + #define CONFIG_CMD_BDI + #define CONFIG_CMD_CACHE + #define CONFIG_CMD_EXT2 + #define CONFIG_CMD_FAT + #define CONFIG_CMD_IMI + #define CONFIG_CMD_IRQ + #define CONFIG_CMD_LOADB + #define CONFIG_CMD_LOADS + #define CONFIG_CMD_MEMORY + #define CONFIG_CMD_MISC + #define CONFIG_CMD_MFSL + #define CONFIG_CMD_NET + #define CONFIG_CMD_PING + #define CONFIG_CMD_RUN + + #if defined(FLASH) + #define CONFIG_CMD_ECHO + #define CONFIG_CMD_FLASH + #define CONFIG_CMD_IMLS + #define CONFIG_CMD_JFFS2 + + #if !defined(RAMENV) + #define CONFIG_CMD_ENV + #define CONFIG_CMD_SAVES #endif + #endif - #else /* !FLASH */ - #define CONFIG_COMMANDS (CONFIG__CMD_DFL |\ - CFG_CMD_MEMORY |\ - CFG_CMD_MISC |\ - CFG_CMD_AUTOSCRIPT |\ - CFG_CMD_IRQ |\ - CFG_CMD_ASKENV |\ - CFG_CMD_BDI |\ - CFG_CMD_RUN |\ - CFG_CMD_LOADS |\ - CFG_CMD_FAT |\ - CFG_CMD_EXT2 |\ - CFG_CMD_LOADB |\ - CFG_CMD_IMI |\ - CFG_CMD_NET |\ - CFG_CMD_CACHE |\ - CFG_CMD_MFSL |\ - CFG_CMD_PING \ - ) - #endif /* !FLASH */ - /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ - #include - - #if (CONFIG_COMMANDS & CFG_CMD_JFFS2) + #if defined(CONFIG_CMD_JFFS2) /* JFFS2 partitions */ #define CONFIG_JFFS2_CMDLINE /* mtdparts command line support */ #define MTDIDS_DEFAULT "nor0=ml401-0" diff --cc include/configs/xupv2p.h index bac31f476b,35001d7ada..b93b3876bc --- a/include/configs/xupv2p.h +++ b/include/configs/xupv2p.h @@@ -141,48 -118,39 +141,40 @@@ #define CFG_ENV_IS_NOWHERE 1 #define CFG_ENV_SIZE 0x1000 #define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE) - #ifndef XILINX_SYSACE_BASEADDR - #define CONFIG_COMMANDS (CONFIG__CMD_DFL |\ - CFG_CMD_MEMORY |\ - CFG_CMD_IRQ |\ - CFG_CMD_BDI |\ - CFG_CMD_NET |\ - CFG_CMD_IMI |\ - CFG_CMD_ECHO |\ - CFG_CMD_CACHE |\ - CFG_CMD_RUN |\ - CFG_CMD_AUTOSCRIPT |\ - CFG_CMD_ASKENV |\ - CFG_CMD_LOADS |\ - CFG_CMD_LOADB |\ - CFG_CMD_MISC |\ - CFG_CMD_MFSL |\ - CFG_CMD_PING \ - ) - #else - #define CONFIG_COMMANDS (CONFIG__CMD_DFL |\ - CFG_CMD_MEMORY |\ - CFG_CMD_IRQ |\ - CFG_CMD_BDI |\ - CFG_CMD_NET |\ - CFG_CMD_IMI |\ - CFG_CMD_ECHO |\ - CFG_CMD_CACHE |\ - CFG_CMD_RUN |\ - CFG_CMD_AUTOSCRIPT |\ - CFG_CMD_ASKENV |\ - CFG_CMD_LOADS |\ - CFG_CMD_LOADB |\ - CFG_CMD_MISC |\ - CFG_CMD_FAT |\ - CFG_CMD_EXT2 |\ - CFG_CMD_MFSL |\ - CFG_CMD_PING \ - ) - #endif - /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ - #include - + /* + * BOOTP options + */ + #define CONFIG_BOOTP_BOOTFILESIZE + #define CONFIG_BOOTP_BOOTPATH + #define CONFIG_BOOTP_GATEWAY + #define CONFIG_BOOTP_HOSTNAME + - + /* + * Command line configuration. + */ + #include + + #define CONFIG_CMD_MEMORY + #define CONFIG_CMD_IRQ + #define CONFIG_CMD_BDI + #define CONFIG_CMD_NET + #define CONFIG_CMD_IMI + #define CONFIG_CMD_ECHO + #define CONFIG_CMD_CACHE + #define CONFIG_CMD_RUN + #define CONFIG_CMD_AUTOSCRIPT + #define CONFIG_CMD_ASKENV + #define CONFIG_CMD_LOADS + #define CONFIG_CMD_LOADB + #define CONFIG_CMD_MISC -#define CONFIG_CMD_FAT -#define CONFIG_CMD_EXT2 + #define CONFIG_CMD_PING ++#define CONFIG_CMD_MFSL + ++#ifdef XILINX_SYSACE_BASEADDR ++#define CONFIG_CMD_EXT2 ++#define CONFIG_CMD_FAT ++#endif /* Miscellaneous configurable options */ #define CFG_PROMPT "U-Boot-mONStR> "