February 2008 - U-Boot

[U-Boot-Users] ARM AT91 Ethernet address register
by Rafal Jaworowski 14 Feb '08

14 Feb '08

Hi Peter, What is the reason the MAC address on the AT91 is written in the 2nd address register, leaving the first one out? Is there something particular about this? See cpu/arm920t/at91rm9200/ether.c, eth_init() ... p_mac->EMAC_SA2L = ... ... The reason I ask is this may confuse OS driver if no MAC address is found in the first register (which is the case for FreeBSD/ARM, for example). Rafal

2 2

[U-Boot-Users] Linux couldn't start up
by Robert 14 Feb '08

14 Feb '08

Hi, I make a linux uImage with command "make uImage" , and linux kernel can start up after downloading it into the target board, but now I want to generate uImage by vmlinux with mkimage, not by "make uImage",so I do it as follows: 1)arm-none-linux-gnueabi-objcopy -O binary -R .note -R .comment \ -S /home/linux-2.6.12/vmlinux /home/temp/vmlinux.bin 2)gzip -9 /home/temp/vmlinux.bin 3)mkimage -A arm -O linux -T kernel -C none \ -a 00008000 -e 00008000 \ -n 'Linux-2.6.12.6-arm1' -d /home/temp/vmlinux.bin.gz /home/temp/uImage At last, I load uImage to ram to run, but the following message happens: Marvell>> tftp 0x400000 uImage Using egiga0 device TFTP from server 192.168.0.53; our IP address is 192.168.0.54 Filename 'uImage'. Load address: 0x400000 Loading: ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ########## done Bytes transferred = 1710086 (1a1806 hex) Marvell>> bootm 0x400000 ## Booting image at 00400000 ... Image Name: Linux-2.6.12.6-arm1 Created: 2008-02-03 17:12:54 UTC Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 1710022 Bytes = 1.6 MB Load Address: 00008000 Entry Point: 00008000 Verifying Checksum ... OK OK Starting kernel ... undefined instruction pc : [<ffffffff>] lr : [<00249274>] sp : 001ff16c ip : ffffffff fp : 001ff694 r10: 00000000 r9 : 002570a8 r8 : 001fffd4 r7 : 000000ff r6 : 0027ee58 r5 : 00000000 r4 : 0027ee58 r3 : 00008000 r2 : 00000100 r1 : 0000020e r0 : 00000000 Flags: NZCV IRQs off FIQs off Mode SYS_32 Resetting CPU ... Can anybody tell me what happend? Thanks in advance! With kind regards, Rboert

2 2

[U-Boot-Users] [PATCH] ppc4xx: Add CONFIG_4xx_DCACHE compile switch to Denali-core SPD code
by Larry Johnson 14 Feb '08

14 Feb '08

Signed-off-by: Larry Johnson <lrj(a)acm.org> --- cpu/ppc4xx/denali_spd_ddr2.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpu/ppc4xx/denali_spd_ddr2.c b/cpu/ppc4xx/denali_spd_ddr2.c index 825bc21..60f89c9 100644 --- a/cpu/ppc4xx/denali_spd_ddr2.c +++ b/cpu/ppc4xx/denali_spd_ddr2.c @@ -3,7 +3,7 @@ * This SPD SDRAM detection code supports AMCC PPC44x CPUs with a Denali-core * DDR2 controller, specifically the 440EPx/GRx. * - * (C) Copyright 2007 + * (C) Copyright 2007-2008 * Larry Johnson, lrj(a)acm.org. * * Based primarily on cpu/ppc4xx/4xx_spd_ddr2.c, which is... @@ -77,10 +77,10 @@ * memory. * * If at some time this restriction doesn't apply anymore, just define - * CFG_ENABLE_SDRAM_CACHE in the board config file and this code should setup + * CONFIG_4xx_DCACHE in the board config file and this code should setup * everything correctly. */ -#if defined(CFG_ENABLE_SDRAM_CACHE) +#if defined(CONFIG_4xx_DCACHE) #define MY_TLB_WORD2_I_ENABLE 0 /* enable caching on SDRAM */ #else #define MY_TLB_WORD2_I_ENABLE TLB_WORD2_I_ENABLE /* disable caching on SDRAM */ -- 1.5.2.5

2 1

[U-Boot-Users] USB ethernet for OMAP850
by Tim Chen 14 Feb '08

14 Feb '08

Hi, I'm porting Linux kernel to OMAP850. I loaded kernel via JTAG, now kernel is booting and can output message to UART console. Now I'm trying to boot kernel from u-boot. I would like to load kernel via ethernet, but my OMAP850 board has no ethernet chip on it. Is there any way to use usb port as ethernet? What should I look for? something like usbnet? Thanks. -- ---- Tim.

1 0

[U-Boot-Users] 440EPX is not booting from 1Gb/128MB NAND flash
by Nikhil Gautam 14 Feb '08

14 Feb '08

Hi, I am trying to boot my board which is based on Sequoia 440EPX. The only difference between my board and the reference board is that I have a 1 Gb NAND flash ( NAND01GW3B2A) instead of 256Mb flash present on reference board. In U-boot I have changed the board configuration file to reflect correct specs. * Now the NAND chip has to be defined (no autodetection used!) */ #define CFG_NAND_PAGE_SIZE (2048) /* NAND chip page size */ #define CFG_NAND_BLOCK_SIZE (128 << 10) /* NAND chip block size */ #define CFG_NAND_PAGE_COUNT (64) /* NAND chip page count */ #define CFG_NAND_BAD_BLOCK_POS (5) /* Location of bad block marker */ #define CFG_NAND_4_ADDR_CYCLE /* Fourth addr used (>32MB) */ I have also changed the eeprom configuration word to 0x87788252 0x0947D010 0xA0A82358 0x0D050000 Is there any other place where some NAND configuration is defined? Thanks Nikhil

3 14

[U-Boot-Users] [PATCH] ppc4xx: Fix problem with init-ram bigger than 4k on 440 platforms
by Stefan Roese 14 Feb '08

14 Feb '08

Signed-off-by: Stefan Roese <sr(a)denx.de> --- cpu/ppc4xx/start.S | 4 ++++ include/configs/pcs440ep.h | 2 +- include/configs/yosemite.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cpu/ppc4xx/start.S b/cpu/ppc4xx/start.S index 77c2aa4..0638024 100644 --- a/cpu/ppc4xx/start.S +++ b/cpu/ppc4xx/start.S @@ -110,6 +110,10 @@ # endif #endif /* CFG_INIT_DCACHE_CS */ +#if (defined(CFG_INIT_RAM_DCACHE) && (CFG_INIT_RAM_END > (4 << 10))) +#error Only 4k of init-ram is supported - please adjust CFG_INIT_RAM_END! +#endif + #define function_prolog(func_name) .text; \ .align 2; \ .globl func_name; \ diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h index d66f4bd..07fc23e 100644 --- a/include/configs/pcs440ep.h +++ b/include/configs/pcs440ep.h @@ -66,7 +66,7 @@ *----------------------------------------------------------------------*/ #define CFG_INIT_RAM_DCACHE 1 /* d-cache as init ram */ #define CFG_INIT_RAM_ADDR 0x70000000 /* DCache */ -#define CFG_INIT_RAM_END (8 << 10) +#define CFG_INIT_RAM_END (4 << 10) #define CFG_GBL_DATA_SIZE 256 /* num bytes initial data*/ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index a8eeff9..4c86bc5 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -75,7 +75,7 @@ *----------------------------------------------------------------------*/ #define CFG_INIT_RAM_DCACHE 1 /* d-cache as init ram */ #define CFG_INIT_RAM_ADDR 0x70000000 /* DCache */ -#define CFG_INIT_RAM_END (8 << 10) +#define CFG_INIT_RAM_END (4 << 10) #define CFG_GBL_DATA_SIZE 256 /* num bytes initial data*/ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET -- 1.5.4.rc5

2 2

[U-Boot-Users] NFS Timeout with large files.
by Upakul Barkakaty 14 Feb '08

14 Feb '08

Hi all, I am facing a timeout problem with nfs while transferring large files. However i encounter no problem with smaller files. The entire thing works fine with another nfs server. Any hints on what could be the problem ?? -- Regards, Upakul Barkakaty

3 5

[U-Boot-Users] [PATCH] ARM926: compile cpu_init_crit function only if CONFIG_SKIP_LOWLEVEL_INIT is not defined
by Hebbar 14 Feb '08

14 Feb '08

Hi, This patches allows cpu_init_crit function to be compilled only if CONFIG_SKIP_LOWLEVEL_INIT is not defined. At present irrespective of CONFIG_SKIP_LOWLEVEL_INIT, cpu_init_crit is always compilled. This is for arm926ejs module. --- u-boot-1.3.1/cpu/arm926ejs/start.S 2007-12-06 01:21:19.000000000 -0800 +++ uboot/cpu/arm926ejs/start.S 2007-12-19 08:40:37.296875000 -0800 @@ -187,7 +187,7 @@ clbss_l:str r2, [r0] /* clear loop... _start_armboot: .word start_armboot - +#ifndef CONFIG_SKIP_LOWLEVEL_INIT /* ************************************************************************* * @@ -225,6 +225,9 @@ cpu_init_crit: bl lowlevel_init /* go setup pll,mux,memory */ mov lr, ip /* restore link */ mov pc, lr /* back to my caller */ + +#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ + /* ************************************************************************* * Signed-off-by: Hebbar I welcome comments, complaints, suggestions and advices. Regards Gururaja -- View this message in context: http://www.nabble.com/-PATCH--ARM926%3A-compile-cpu_init_crit-function-only… Sent from the Uboot - Users mailing list archive at Nabble.com.

3 6

[U-Boot-Users] [PATCH] Only use TEXT_BASE if defined by the board
by Mike Frysinger 14 Feb '08

14 Feb '08

Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- config.mk | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/config.mk b/config.mk index 79e5a31..bff95bd 100644 --- a/config.mk +++ b/config.mk @@ -147,7 +147,10 @@ OBJCFLAGS += --gap-fill=0xff gccincdir := $(shell $(CC) -print-file-name=include) CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS) \ - -D__KERNEL__ -DTEXT_BASE=$(TEXT_BASE) \ + -D__KERNEL__ +ifneq ($(TEXT_BASE),) +CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +endif ifneq ($(OBJTREE),$(SRCTREE)) CPPFLAGS += -I$(OBJTREE)/include2 -I$(OBJTREE)/include @@ -185,7 +188,10 @@ endif AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS) -LDFLAGS += -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS) +LDFLAGS += -Bstatic -T $(LDSCRIPT) $(PLATFORM_LDFLAGS) +ifneq ($(TEXT_BASE),) +LDFLAGS += -Ttext $(TEXT_BASE) +endif # Location of a usable BFD library, where we define "usable" as # "built for ${HOST}, supports ${TARGET}". Sensible values are -- 1.5.3.8

2 1

[U-Boot-Users] [PATCH] Fix remaining CONFIG_COMMANDS
by Jean-Christophe PLAGNIOL-VILLARD 14 Feb '08

14 Feb '08

update comments Fix coding style Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> diff --git a/api/api_storage.c b/api/api_storage.c index 7cd4efb..7e63240 100644 --- a/api/api_storage.c +++ b/api/api_storage.c @@ -61,21 +61,21 @@ static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, "" }, }; void dev_stor_init(void) { -#if (CONFIG_COMMANDS & CFG_CMD_IDE) +#if defined(CONFIG_CMD_IDE) specs[ENUM_IDE].max_dev = CFG_IDE_MAXDEVICE; specs[ENUM_IDE].enum_started = 0; specs[ENUM_IDE].enum_ended = 0; specs[ENUM_IDE].type = DEV_TYP_STOR | DT_STOR_IDE; specs[ENUM_IDE].name = "ide"; #endif -#if (CONFIG_COMMANDS & CFG_CMD_USB) +#if defined(CONFIG_CMD_USB) specs[ENUM_USB].max_dev = USB_MAX_STOR_DEV; specs[ENUM_USB].enum_started = 0; specs[ENUM_USB].enum_ended = 0; specs[ENUM_USB].type = DEV_TYP_STOR | DT_STOR_USB; specs[ENUM_USB].name = "usb"; #endif -#if (CONFIG_COMMANDS & CFG_CMD_SCSI) +#if defined(CONFIG_CMD_SCSI) specs[ENUM_SCSI].max_dev = CFG_SCSI_MAX_DEVICE; specs[ENUM_SCSI].enum_started = 0; specs[ENUM_SCSI].enum_ended = 0; diff --git a/board/BuS/EB+MCF-EV123/mii.c b/board/BuS/EB+MCF-EV123/mii.c index ebd3ed9..5182792 100644 --- a/board/BuS/EB+MCF-EV123/mii.c +++ b/board/BuS/EB+MCF-EV123/mii.c @@ -132,7 +132,7 @@ uint mii_send(uint mii_cmd) return (mii_reply & 0xffff); /* data read from phy */ } -#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */ +#endif /* CFG_DISCOVER_PHY || CONFIG_CMD_MII) */ #if defined(CFG_DISCOVER_PHY) int mii_discover_phy(struct eth_device *dev) diff --git a/board/amcc/kilauea/cmd_pll.c b/board/amcc/kilauea/cmd_pll.c index b2666dd..0f480b9 100644 --- a/board/amcc/kilauea/cmd_pll.c +++ b/board/amcc/kilauea/cmd_pll.c @@ -294,4 +294,4 @@ U_BOOT_CMD( -----------------------------------------------\n" ); -#endif /* (CONFIG_COMMANDS & CFG_CMD_EEPROM) */ +#endif /* (CONFIG_CMD_EEPROM) */ diff --git a/board/amcc/makalu/cmd_pll.c b/board/amcc/makalu/cmd_pll.c index b2666dd..0f480b9 100644 --- a/board/amcc/makalu/cmd_pll.c +++ b/board/amcc/makalu/cmd_pll.c @@ -294,4 +294,4 @@ U_BOOT_CMD( -----------------------------------------------\n" ); -#endif /* (CONFIG_COMMANDS & CFG_CMD_EEPROM) */ +#endif /* (CONFIG_CMD_EEPROM) */ diff --git a/board/cobra5272/mii.c b/board/cobra5272/mii.c index fadcbb3..9ca2902 100644 --- a/board/cobra5272/mii.c +++ b/board/cobra5272/mii.c @@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd) return (mii_reply & 0xffff); /* data read from phy */ } -#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */ +#endif /* CFG_DISCOVER_PHY || (CONFIG_CMD_MII) */ #if defined(CFG_DISCOVER_PHY) int mii_discover_phy(struct eth_device *dev) diff --git a/board/idmr/mii.c b/board/idmr/mii.c index f6c63c3..706c90f 100644 --- a/board/idmr/mii.c +++ b/board/idmr/mii.c @@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd) return (mii_reply & 0xffff); /* data read from phy */ } -#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */ +#endif /* CFG_DISCOVER_PHY || (CONFIG_CMD_MII) */ #if defined(CFG_DISCOVER_PHY) int mii_discover_phy(struct eth_device *dev) diff --git a/board/m5271evb/mii.c b/board/m5271evb/mii.c index 3830ce7..57562e6 100644 --- a/board/m5271evb/mii.c +++ b/board/m5271evb/mii.c @@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd) return (mii_reply & 0xffff); /* data read from phy */ } -#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */ +#endif /* CFG_DISCOVER_PHY || (CONFIG_CMD_MII) */ #if defined(CFG_DISCOVER_PHY) int mii_discover_phy(struct eth_device *dev) diff --git a/board/m5272c3/mii.c b/board/m5272c3/mii.c index 0ecc44a..22b195a 100644 --- a/board/m5272c3/mii.c +++ b/board/m5272c3/mii.c @@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd) return (mii_reply & 0xffff); /* data read from phy */ } -#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */ +#endif /* CFG_DISCOVER_PHY || (CONFIG_CMD_MII) */ #if defined(CFG_DISCOVER_PHY) int mii_discover_phy(struct eth_device *dev) diff --git a/board/m5282evb/mii.c b/board/m5282evb/mii.c index d7c6d1f..09d17ca 100644 --- a/board/m5282evb/mii.c +++ b/board/m5282evb/mii.c @@ -132,7 +132,7 @@ uint mii_send(uint mii_cmd) return (mii_reply & 0xffff); /* data read from phy */ } -#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */ +#endif /* CFG_DISCOVER_PHY || (CONFIG_CMD_MII) */ #if defined(CFG_DISCOVER_PHY) int mii_discover_phy(struct eth_device *dev) diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c index 80c4ba2..c966f7a 100644 --- a/drivers/net/cs8900.c +++ b/drivers/net/cs8900.c @@ -317,6 +317,6 @@ int cs8900_e2prom_write(unsigned char addr, unsigned short value) return 0; } -#endif /* COMMANDS & CFG_NET */ +#endif /*CONFIG_CMD_NET */ #endif /* CONFIG_DRIVER_CS8900 */ diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c index ecdcbd9..51cfb7e 100644 --- a/drivers/net/lan91c96.c +++ b/drivers/net/lan91c96.c @@ -36,12 +36,12 @@ * AUI/TP selection ( mine has 10Base2/10BaseT select ) * * Arguments: - * io = for the base address + * io = for the base address * irq = for the IRQ * * author: - * Erik Stahlman ( erik(a)vt.edu ) - * Daris A Nevil ( dnevil(a)snmc.com ) + * Erik Stahlman ( erik(a)vt.edu ) + * Daris A Nevil ( dnevil(a)snmc.com ) * * * Hardware multicast code from Peter Cammaert ( pc(a)denkart.be ) @@ -53,7 +53,7 @@ * o lan91c96.c (Intel Diagnostic Manager driver) * * History: - * 04/30/03 Mathijs Haarman Modified smc91111.c (u-boot version) + * 04/30/03 Mathijs Haarman Modified smc91111.c (u-boot version) * for lan91c96 *--------------------------------------------------------------------------- */ @@ -296,8 +296,8 @@ static int poll4int (byte mask, int timeout) /* * Function: smc_reset( void ) * Purpose: - * This sets the SMC91111 chip to its normal state, hopefully from whatever - * mess that any other DOS driver has put it in. + * This sets the SMC91111 chip to its normal state, hopefully from whatever + * mess that any other DOS driver has put it in. * * Maybe I should reset more registers to defaults in here? SOFTRST should * do that for me. @@ -397,7 +397,7 @@ static void smc_shutdown () * This sends the actual packet to the SMC9xxx chip. * * Algorithm: - * First, see if a saved_skb is available. + * First, see if a saved_skb is available. * ( this should NOT be called if there is no 'saved_skb' * Now, find the packet number that the chip allocated * Point the data pointers at it in memory @@ -405,9 +405,9 @@ static void smc_shutdown () * Dump the packet to chip memory * Check if a last byte is needed ( odd length packet ) * if so, set the control flag right - * Tell the card to send it + * Tell the card to send it * Enable the transmit interrupt, so I know if it failed - * Free the kernel data if I actually sent it. + * Free the kernel data if I actually sent it. */ static int smc_send_packet (volatile void *packet, int packet_length) { @@ -865,7 +865,7 @@ static int smc_hw_init () } #endif /* 0 */ -#endif /* COMMANDS & CFG_NET */ +#endif /* CONFIG_CMD_NET */ /* smc_get_ethaddr (bd_t * bd) diff --git a/drivers/net/netarm_eth.c b/drivers/net/netarm_eth.c index a99ee5d..b418e08 100644 --- a/drivers/net/netarm_eth.c +++ b/drivers/net/netarm_eth.c @@ -355,6 +355,6 @@ extern int eth_send (volatile void *packet, int length) return 1; } -#endif /* COMMANDS & CFG_NET */ +#endif /* CONFIG_CMD_NET */ #endif /* CONFIG_DRIVER_NETARMETH */ diff --git a/drivers/net/rtl8019.c b/drivers/net/rtl8019.c index 409a69f..d6cafba 100644 --- a/drivers/net/rtl8019.c +++ b/drivers/net/rtl8019.c @@ -277,6 +277,6 @@ extern int eth_send (volatile void *packet, int length) return 0; } -#endif /* COMMANDS & CFG_NET */ +#endif /* CONFIG_CMD_NET */ #endif /* CONFIG_DRIVER_RTL8019 */ diff --git a/drivers/rtc/rx8025.c b/drivers/rtc/rx8025.c index 6c94ae1..bf2c953 100644 --- a/drivers/rtc/rx8025.c +++ b/drivers/rtc/rx8025.c @@ -224,4 +224,4 @@ static unsigned char bin2bcd (unsigned int n) return (((n / 10) << 4) | (n % 10)); } -#endif /* CONFIG_RTC_RX8025 && (CFG_COMMANDS & CFG_CMD_DATE) */ +#endif /* CONFIG_RTC_RX8025 && (CONFIG_CMD_DATE) */ diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 67bf4b1..e8b405a 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -385,7 +385,7 @@ *----------------------------------------------------------------------*/ #define CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #else #define CFG_CBSIZE 256 /* Console I/O Buffer Size */ @@ -503,7 +503,7 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #endif diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index f3e8601..a1d1533 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -476,7 +476,7 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #endif diff --git a/include/configs/makalu.h b/include/configs/makalu.h index 8f8e867..2f0b0a8 100644 --- a/include/configs/makalu.h +++ b/include/configs/makalu.h @@ -385,7 +385,7 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #endif diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index 8a94c28..537afe0 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -43,9 +43,10 @@ #define CFG_CMD_PCMCIA 0x01 #define CFG_CMD_IDE 0x02 -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | \ - CFG_CMD_IDE|CFG_CMD_PCMCIA) & \ - ~(CFG_CMD_FPGA)) +#define CONFIG_CMD_DFL 1 +#define CONFIG_CMD_IDE 1 +#define CONFIG_CMD_PCMCIA 1 +#undef CONFIG_CMD_FPGA #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200" @@ -104,7 +105,7 @@ #define CFG_ENV_SECT_SIZE (64 * 1024) #define CFG_ENV_SIZE CFG_ENV_SECT_SIZE #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -#define CFG_FLASH_ERASE_TOUT 120000 +#define CFG_FLASH_ERASE_TOUT 120000 #define CFG_FLASH_WRITE_TOUT 500 /* Board Clock */ diff --git a/include/configs/munices.h b/include/configs/munices.h index 2372b57..38b27bb 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -48,7 +48,7 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) # define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h index 84998d4..8916432 100644 --- a/include/configs/trizepsiv.h +++ b/include/configs/trizepsiv.h @@ -140,7 +140,7 @@ #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ /* #define CONFIG_INITRD_TAG 1 */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #endif @@ -315,7 +315,7 @@ /* Flash environment locations */ #define CFG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_MONITOR_LEN) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment */ +#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment */ #define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -- 1.5.3.7

3 3