November 2010 - U-Boot

[U-Boot] [PATCH 1/2] S5P: smdkc100: fix for relocation
by Minkyu Kang 30 Nov '10

30 Nov '10

Signed-off-by: Minkyu Kang <mk7.kang(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- board/samsung/smdkc100/smdkc100.c | 10 +++++++--- include/configs/smdkc100.h | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c index 31e8d9e..d3189f6 100644 --- a/board/samsung/smdkc100/smdkc100.c +++ b/board/samsung/smdkc100/smdkc100.c @@ -65,13 +65,17 @@ int board_init(void) int dram_init(void) { - gd->bd->bi_dram[0].start = PHYS_SDRAM_1; - gd->bd->bi_dram[0].size = get_ram_size((long *)PHYS_SDRAM_1, - PHYS_SDRAM_1_SIZE); + gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE); return 0; } +void dram_init_banksize(void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM_1; + gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; +} + #ifdef CONFIG_DISPLAY_BOARDINFO int checkboard(void) { diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index e36b262..fb8b43c 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -231,6 +231,8 @@ #define CONFIG_DOS_PARTITION 1 +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) + /* * Ethernet Contoller driver */ -- 1.7.0.4

2 1

[U-Boot] [PATCH] AM3517:EMIF4: fix SDRAM size to 256Mb
by hvaibhav＠ti.com 29 Nov '10

29 Nov '10

From: Vaibhav Hiremath <hvaibhav(a)ti.com> With addition of "dram_init_banksize()" function from Heiko,Schocher (commit ID: 561142af20f1fd7b425d9425730014e656defb91), the DRAM size is getting configured wrongly to 512Mb (CS0 & CS1). So fix it to 256Mb. Signed-off-by: Vaibhav Hiremath <hvaibhav(a)ti.com> --- arch/arm/cpu/armv7/omap3/emif4.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/omap3/emif4.c b/arch/arm/cpu/armv7/omap3/emif4.c index 0870857..2227576 100644 --- a/arch/arm/cpu/armv7/omap3/emif4.c +++ b/arch/arm/cpu/armv7/omap3/emif4.c @@ -48,10 +48,11 @@ u32 is_mem_sdr(void) */ u32 get_sdr_cs_size(u32 cs) { - u32 size; + u32 size = 0; /* TODO: Calculate the size based on EMIF4 configuration */ - size = CONFIG_SYS_CS0_SIZE; + if (cs == CS0) + size = CONFIG_SYS_CS0_SIZE; return size; } -- 1.6.2.4

2 2

[U-Boot] [PATCH] AM3517:Build FIX: undef CONFIG_CMD_NFS support
by hvaibhav＠ti.com 29 Nov '10

29 Nov '10

From: Vaibhav Hiremath <hvaibhav(a)ti.com> Without CONFIG_CMD_NET support CONFIG_CMD_NFS leads to linking error, so disable CONFIG_CMD_NFS option. Signed-off-by: Vaibhav Hiremath <hvaibhav(a)ti.com> --- include/configs/am3517_evm.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 3dda1e9..70e8f07 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -163,6 +163,7 @@ #define CONFIG_DRIVER_OMAP34XX_I2C 1 #undef CONFIG_CMD_NET +#undef CONFIG_CMD_NFS /* * Board NAND Info. */ -- 1.6.2.4

2 1

[U-Boot] [PATCH] omap3evm: Use GENERATED_GBL_DATA_SIZE
by Sanjeev Premi 29 Nov '10

29 Nov '10

The macro CONFIG_SYS_GBL_DATA_SIZE has been replaced with GENERATED_GBL_DATA_SIZE. Also define macros: CONFIG_SYS_INIT_RAM_ADDR and CONFIG_SYS_INIT_RAM_SIZE. Based on changes for omap3_beagle in the commit: 31bfcf1c5776df3d90286aa15104c45096d53dc6 Signed-off-by: Sanjeev Premi <premi(a)ti.com> --- include/configs/omap3_evm.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index aeb45c6..1a4b0ee 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -348,7 +348,11 @@ extern unsigned int boot_flash_type; * Support for relocation */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 -#define CONFIG_SYS_INIT_SP_ADDR (LOW_LEVEL_SRAM_STACK - CONFIG_SYS_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800 +#define CONFIG_SYS_INIT_RAM_SIZE 0x800 +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_SIZE - \ + GENERATED_GBL_DATA_SIZE) /* * Define the board revision statically -- 1.7.2.2

2 1

[U-Boot] [PATCH] ARMV7: OMAP3: Fix build failure for igep0030 machine
by Enric Balletbo i Serra 29 Nov '10

29 Nov '10

Seems that if CONFIG_CMD_NET is undefined we should also undefine CONFIG_CMD_NFS, otherwise build fails with various undefined reference like: net/libnet.o: In function `rpc_req': u-boot/net/nfs.c:193: undefined reference to `NetEthHdrSize' u-boot/net/nfs.c:202: undefined reference to `NetSendUDPPacket' u-boot/net/nfs.c:203: undefined reference to `NetTxPacket' u-boot/net/nfs.c:203: undefined reference to `NetServerEther' This patch adds the undef CONFIG_CMD_NFS in configuration file. Signed-off-by: Enric Balletbo i Serra <eballetbo(a)iseebcn.com> --- include/configs/igep0030.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/configs/igep0030.h b/include/configs/igep0030.h index d61793c..1325bfa 100644 --- a/include/configs/igep0030.h +++ b/include/configs/igep0030.h @@ -110,6 +110,7 @@ #define CONFIG_MTD_DEVICE #undef CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ +#undef CONFIG_CMD_NFS /* nfs */ #undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ #undef CONFIG_CMD_IMLS /* List all found images */ -- 1.7.0.4

2 1

[U-Boot] Please pull u-boot-ti/master
by s-paulraj＠ti.com 29 Nov '10

29 Nov '10

Wolfgang, Please pull this patch to your master. With this one more ARM board builds Thanks, Sandeep The following changes since commit d0d2271f8c62e830ec65fb069b6d12dd708e3e2f: Wolfgang Denk (1): Prepare v2010.12-rc2 are available in the git repository at: git://git.denx.de/u-boot-ti.git master Dirk Behme (1): OMAP4: SDP4430: Disable CMD_NFS include/configs/omap4_sdp4430.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

2 1

[U-Boot] v2010-rc2: OMAP3 broken
by Wolfgang Denk 29 Nov '10

29 Nov '10

Hi, it seems that commit 566d49a3f has broken OMAP3 - at least beagle and devkit8000 hang in or after relocation. The culprit is this the "$(sort $(LIBS)) in Makefile, i. e. the following change will unbreak the boards: @@ -263,7 +263,7 @@ ifeq ($(SOC),s5pc2xx) LIBS += $(CPUDIR)/s5p-common/libs5p-common.o endif -LIBS := $(addprefix $(obj),$(sort $(LIBS))) +LIBS := $(addprefix $(obj),$(LIBS)) .PHONY : $(LIBS) $(TIMESTAMP_FILE) $(VERSION_FILE) LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o Unfortunately we need the sort to avoild duplicate listing of libs / objects on PowerPC. And I don;t understand yet how this change can cause such an affect. Any help welcome. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de It seems intuitively obvious to me, which means that it might be wrong. -- Chris Torek

8 15

[U-Boot] [PATCH] ARMV7:ca9x4_ct_vxp: udelay reference fix
by Matt Waddel 29 Nov '10

29 Nov '10

Fixes undefined reference to `__udelay' build failure. Signed-off-by: Matt Waddel <matt.waddel(a)linaro.org> --- board/armltd/vexpress/ca9x4_ct_vxp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/armltd/vexpress/ca9x4_ct_vxp.c b/board/armltd/vexpress/ca9x4_ct_vxp.c index c1c4ea1..ce1be1e 100644 --- a/board/armltd/vexpress/ca9x4_ct_vxp.c +++ b/board/armltd/vexpress/ca9x4_ct_vxp.c @@ -157,7 +157,7 @@ void reset_cpu(ulong addr) * Delay x useconds AND perserve advance timstamp value * assumes timer is ticking at 1 msec */ -void udelay(ulong usec) +void __udelay(ulong usec) { ulong tmo, tmp; -- 1.7.1

2 1

[U-Boot] [PATCH] OMAP3: Zoom2: Fix ARM relocation support
by Dirk Behme 29 Nov '10

29 Nov '10

Signed-off-by: Dirk Behme <dirk.behme(a)googlemail.com> --- Compile tested only. board/logicpd/zoom2/config.mk | 2 +- include/configs/omap3_zoom2.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) Index: u-boot.git/board/logicpd/zoom2/config.mk =================================================================== --- u-boot.git.orig/board/logicpd/zoom2/config.mk +++ u-boot.git/board/logicpd/zoom2/config.mk @@ -30,4 +30,4 @@ # (mem base + reserved) # For use with external or internal boots. -CONFIG_SYS_TEXT_BASE = 0x80e80000 +CONFIG_SYS_TEXT_BASE = 0x80008000 Index: u-boot.git/include/configs/omap3_zoom2.h =================================================================== --- u-boot.git.orig/include/configs/omap3_zoom2.h +++ u-boot.git/include/configs/omap3_zoom2.h @@ -188,6 +188,12 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "usbtty=cdc_acm\0" \ +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800 +#define CONFIG_SYS_INIT_RAM_SIZE 0x800 +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_SIZE - \ + GENERATED_GBL_DATA_SIZE) /* * Miscellaneous configurable options */

1 0

[U-Boot] [PATCH] OMAP3: Zoom1: Fix ARM relocation support
by Dirk Behme 29 Nov '10

29 Nov '10

Signed-off-by: Dirk Behme <dirk.behme(a)googlemail.com> --- Compile tested only. board/logicpd/zoom1/config.mk | 2 +- include/configs/omap3_zoom1.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) Index: u-boot.git/board/logicpd/zoom1/config.mk =================================================================== --- u-boot.git.orig/board/logicpd/zoom1/config.mk +++ u-boot.git/board/logicpd/zoom1/config.mk @@ -30,4 +30,4 @@ # (mem base + reserved) # For use with external or internal boots. -CONFIG_SYS_TEXT_BASE = 0x80e80000 +CONFIG_SYS_TEXT_BASE = 0x80008000 Index: u-boot.git/include/configs/omap3_zoom1.h =================================================================== --- u-boot.git.orig/include/configs/omap3_zoom1.h +++ u-boot.git/include/configs/omap3_zoom1.h @@ -236,6 +236,12 @@ #define CONFIG_SYS_LOAD_ADDR (OMAP34XX_SDRC_CS0) /* default */ /* load address */ +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800 +#define CONFIG_SYS_INIT_RAM_SIZE 0x800 +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_SIZE - \ + GENERATED_GBL_DATA_SIZE) /* * OMAP3 has 12 GP timers, they can be driven by the system clock * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK).

1 0