[U-Boot] Verifying Checksum ... Bad Data CRC when kernel
Hi all I've found the answer and confirmed it. FTP transfer corrupted uImage. As my development laptop has no COM port, I transferred uImage from this development laptop to my company's FTP server using FileZilla 3.0.11.1, then from this FTP server to my desktop using WS_FTP 9.01. Then, I used this uImage on my desktop for BOTH serial download and copying to SD card. I don't know which, FileZilla or WS_FTP, corrupted uImage. Now I use my thumb drive to do the transfer, kernel boots successfully for both serial download and SD card download. Thanks Regards, Zhao Jihua Embedded Systems Engineer ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] boards.cfg: update local documentation
The options field at the moment is only documented in the changelog which isn't terribly useful to people without git. Signed-off-by: Mike Frysinger vap...@gentoo.org --- boards.cfg | 14 +++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/boards.cfg b/boards.cfg index d6c3401..443f9bd 100644 --- a/boards.cfg +++ b/boards.cfg @@ -3,9 +3,7 @@ # # Syntax: # white-space separated list of entries; -# each entry has the following fields: -# -# Targetname Architecture CPU Boardname Vendor SoC +# each entry has the fields documented below. # # Unused fields can be specified as -, or omitted if they # are the last field on the line. @@ -13,6 +11,16 @@ # Lines starting with '#' are comments. # Blank lines are ignored. # +# The options field takes the form: +# board config name[:comma separated config options] +# Each config option has the form (value defaults to 1): +# option[=value] +# So if you have: +# FOO:HAS_BAR,BAZ=64 +# The file include/configs/FOO.h will be used, and these defines created: +# #define CONFIG_HAS_BAR 1 +# #define CONFIG_BAZ 64 +# # To keep the list sorted, use something like # # :.,$! sort -f -k2,2 -k3,3 -k6,6 -k5,5 -k1,1 -- 1.7.3.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Blackfin: bf527-ezkit-v2: move to boards.cfg
Now that the boards.cfg file supports options to mkconfig, we can move the bf527-ezkit-v2 target out of the Makefile and into boards.cfg. Signed-off-by: Mike Frysinger vap...@gentoo.org --- MAKEALL|4 +--- Makefile |8 boards.cfg |1 + 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/MAKEALL b/MAKEALL index c1f3842..4f787de 100755 --- a/MAKEALL +++ b/MAKEALL @@ -606,9 +606,7 @@ LIST_avr32=$(boards_by_arch avr32) ## Blackfin Systems # -LIST_blackfin=$(boards_by_arch blackfin) - bf527-ezkit-v2 - +LIST_blackfin=$(boards_by_arch blackfin) # ## SH Systems diff --git a/Makefile b/Makefile index 30a564d..b5e3f7c 100644 --- a/Makefile +++ b/Makefile @@ -1177,14 +1177,6 @@ $(NIOS2_GENERIC:%=%_config) : unconfig @$(MKCONFIG) $@ nios2 nios2 nios2-generic altera # -# Blackfin -# - -bf527-ezkit-v2_config : unconfig - @$(MKCONFIG) -t BF527_EZKIT_REV_2_1 \ - bf527-ezkit blackfin blackfin bf527-ezkit - -# # SH3 (SuperH) # diff --git a/boards.cfg b/boards.cfg index 3a965e9..d6c3401 100644 --- a/boards.cfg +++ b/boards.cfg @@ -400,6 +400,7 @@ bct-brettl2 blackfinblackfin bf518f-ezbrd blackfinblackfin bf526-ezbrdblackfinblackfin bf527-ezkitblackfinblackfin +bf527-ezkit-v2 blackfinblackfinbf527-ezkit - - bf527-ezkit:BF527_EZKIT_REV_2_1 bf527-sdp blackfinblackfin bf533-ezkitblackfinblackfin bf533-stampblackfinblackfin -- 1.7.3.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Blackfin: config.mk: drop manual stripping of config vars
Now that the common code takes care of stripping away quotes and such from numeric options, we no longer need to do so ourselves. So drop the custom code we have in the Blackfin config.mk. Signed-off-by: Mike Frysinger vap...@gentoo.org --- arch/blackfin/config.mk |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk index a330084..ab117ca 100644 --- a/arch/blackfin/config.mk +++ b/arch/blackfin/config.mk @@ -26,8 +26,6 @@ CROSS_COMPILE ?= bfin-uclinux- STANDALONE_LOAD_ADDR = 0x1000 -m elf32bfin CONFIG_BFIN_BOOT_MODE := $(strip $(subst ,,$(CONFIG_BFIN_BOOT_MODE))) -CONFIG_ENV_OFFSET := $(strip $(subst ,,$(CONFIG_ENV_OFFSET))) -CONFIG_ENV_SIZE := $(strip $(subst ,,$(CONFIG_ENV_SIZE))) PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN -- 1.7.3.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] arm926ejs, suen3: fix relocation issues
-Original Message- From: Heiko Schocher [mailto:h...@denx.de] Sent: Monday, October 18, 2010 11:43 AM To: u-boot@lists.denx.de Cc: Heiko Schocher; Prafulla Wadaskar Subject: [PATCH] arm926ejs, suen3: fix relocation issues ...snip... diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h index faa0f50..9270296 100644 --- a/include/configs/km_arm.h +++ b/include/configs/km_arm.h @@ -182,6 +182,8 @@ int get_scl (void); /* additions for new relocation code, must be added to all boards */ #define CONFIG_SYS_SDRAM_BASE0x -#define CONFIG_SYS_INIT_SP_ADDR (0x + 0x1000 - /* Fix this */ \ - CONFIG_SYS_GBL_DATA_SIZE) +/* Kirkwood has 2k of Security SRAM, use it for SP */ +#define CONFIG_SYS_INIT_SP_ADDR 0xC8012000 +/* Do early setups now in board_init_f() */ +#define CONFIG_BOARD_EARLY_INIT_F1 Do you really need to 1 here ? Also can you pls confirm that you are getting early console message as pointed by Eric Cooper http://lists.denx.de/pipermail/u-boot/2010-October/079545.html Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] FPGA: Add missing prototype
Add prototype function for ispVMFreeMem to remove warnings when support for Lattice FPGA is compiled. Signed-off-by: Stefano Babic sba...@denx.de --- include/lattice.h |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/lattice.h b/include/lattice.h index 33d2ac3..75729b6 100755 --- a/include/lattice.h +++ b/include/lattice.h @@ -308,6 +308,7 @@ int lattice_info(Lattice_desc *desc); void ispVMStart(void); void ispVMEnd(void); +extern void ispVMFreeMem(void); signed char ispVMCode(void); void ispVMDelay(unsigned short int a_usMicroSecondDelay); void ispVMCalculateCRC32(unsigned char a_ucData); -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/3] at91rm9200ek: convert to at91
Dear Reinhard Meyer, Am 18.10.2010 23:37, schrieb Reinhard Meyer: Dear Andreas Bießmann, Signed-off-by: Andreas Bießmannandreas.de...@googlemail.com This is correct UTF8 coded line +Andreas Bie�mannandreas.de...@gmail.com This is a patch to a latin1 coded file. When you e.g. save this mail and look through it with 'cat file | less' you may see 'Andreas BieDFmann andreas.de...@gmail.com'. When you then look for latin1 coding table you may see DF is 'ß'. So this is correct here. Some other files in the patch are still coded in utf-8 (as the mail is), therefore your MUA represents the stuff correct to you. The file MAINTAINERS is in latin1 coding cause a lot of/some other contributors also have non-ASCII characters in their names. A short test will show this to you: open MAINTAINERS in vim; :set fileencoding=utf8; save; git diff in the 2nd line the ß does not show here (a FFFD box is shown instead. Is it only me or do others have similar problems? No, everyone with correct configured MUA should see this I think that line was produced in a different code page? Yes, the file MAINTAINERS is in latin1 while the mail and some other files touched are in utf-8. Maybe we should refrain from using non ASCII characters within source code? I don't know. But my surname is Bießmann and _not_ Biessmann. Shouldn't we change the coding for all files to utf-8 instead? regards Andreas Bießmann ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] arm926ejs, suen3: fix relocation issues
Helo Prafulla, Prafulla Wadaskar wrote: -Original Message- From: Heiko Schocher [mailto:h...@denx.de] Sent: Monday, October 18, 2010 11:43 AM To: u-boot@lists.denx.de Cc: Heiko Schocher; Prafulla Wadaskar Subject: [PATCH] arm926ejs, suen3: fix relocation issues ...snip... diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h index faa0f50..9270296 100644 --- a/include/configs/km_arm.h +++ b/include/configs/km_arm.h @@ -182,6 +182,8 @@ int get_scl (void); /* additions for new relocation code, must be added to all boards */ #define CONFIG_SYS_SDRAM_BASE 0x -#define CONFIG_SYS_INIT_SP_ADDR (0x + 0x1000 - /* Fix this */ \ -CONFIG_SYS_GBL_DATA_SIZE) +/* Kirkwood has 2k of Security SRAM, use it for SP */ +#define CONFIG_SYS_INIT_SP_ADDR 0xC8012000 +/* Do early setups now in board_init_f() */ +#define CONFIG_BOARD_EARLY_INIT_F 1 Do you really need to 1 here ? No, I fix this in v2. Also can you pls confirm that you are getting early console message as pointed by Eric Cooper http://lists.denx.de/pipermail/u-boot/2010-October/079545.html Hmm.. don;t know if we can compare this, because the suen3 starts from spi flash ... and I see this messages on the suen3 ... Maybe, Eric (added to cc: ) should also try to do early things (like kirkwood_mpp_conf()) in board_early_init_f() as I on the suen3? bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] arm926ejs, suen3: fix relocation issues
- use internal 2k security SRAM as RAM for early stack.
- do early inits in board_init_f()
Signed-off-by: Heiko Schocher h...@denx.de
Cc: Prafulla Wadaskar prafu...@marvell.com
---
changes since v1:
- Add comment from Prafulla Wadaskar, no 1 needed if defining
CONFIG_BOARD_EARLY_INIT_F
board/keymile/km_arm/km_arm.c | 24 +++-
include/configs/km_arm.h |6 --
2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index 7c0b858..a2a8bfe 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -143,7 +143,7 @@ int misc_init_r(void)
return 0;
}
-int board_init(void)
+int board_early_init_f(void)
{
u32 tmp;
@@ -160,14 +160,6 @@ int board_init(void)
writel(tmp (~FLASH_GPIO_PIN) , KW_GPIO0_BASE + 4);
printf(KM: setting NAND mode\n);
- /*
-* arch number of board
-*/
- gd-bd-bi_arch_number = MACH_TYPE_SUEN3;
-
- /* address of boot parameters */
- gd-bd-bi_boot_params = kw_sdram_bar(0) + 0x100;
-
#if defined(CONFIG_SOFT_I2C)
/* init the GPIO for I2C Bitbang driver */
kw_gpio_set_valid(SUEN3_SDA_PIN, 1);
@@ -179,6 +171,20 @@ int board_init(void)
kw_gpio_set_valid(SUEN3_ENV_WP, 38);
kw_gpio_direction_output(SUEN3_ENV_WP, 1);
#endif
+
+ return 0;
+}
+
+int board_init(void)
+{
+ /*
+* arch number of board
+*/
+ gd-bd-bi_arch_number = MACH_TYPE_SUEN3;
+
+ /* address of boot parameters */
+ gd-bd-bi_boot_params = kw_sdram_bar(0) + 0x100;
+
return 0;
}
diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h
index faa0f50..4b706f1 100644
--- a/include/configs/km_arm.h
+++ b/include/configs/km_arm.h
@@ -182,6 +182,8 @@ int get_scl (void);
/* additions for new relocation code, must be added to all boards */
#define CONFIG_SYS_SDRAM_BASE 0x
-#define CONFIG_SYS_INIT_SP_ADDR(0x + 0x1000 - /* Fix
this */ \
- CONFIG_SYS_GBL_DATA_SIZE)
+/* Kirkwood has 2k of Security SRAM, use it for SP */
+#define CONFIG_SYS_INIT_SP_ADDR0xC8012000
+/* Do early setups now in board_init_f() */
+#define CONFIG_BOARD_EARLY_INIT_F
#endif /* _CONFIG_KM_ARM_H */
--
1.7.2.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] MX31: Removed warnings for iomux function
Hi, Stefano, -Original Message- From: u-boot-boun...@lists.denx.de [mailto:u-boot-boun...@lists.denx.de] On Behalf Of Stefano Babic Sent: Tuesday, October 19, 2010 3:24 PM To: u-boot@lists.denx.de Subject: [U-Boot] [PATCH] MX31: Removed warnings for iomux function Removed warnings generated in the mx31_set_pad() function. Signed-off-by: Stefano Babic sba...@denx.de --- arch/arm/cpu/arm1136/mx31/generic.c |2 +- arch/arm/include/asm/arch-mx31/mx31.h |1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c index cbe8243..db5d3f0 100644 --- a/arch/arm/cpu/arm1136/mx31/generic.c +++ b/arch/arm/cpu/arm1136/mx31/generic.c @@ -97,7 +97,7 @@ void mx31_set_pad(enum iomux_pins pin, u32 config) void *reg; pin = IOMUX_PADNUM_MASK; - reg = (IOMUXC_BASE + 0x154) + (pin + 2) / 3 * 4; + reg = (void *)((IOMUXC_BASE + 0x154) + (pin + 2) / 3 * 4); Any reason we need define void *reg here? I also found there is some mess for register read/write in this file, for example, arch/arm/cpu/arm1136/mx31/generic.c: In function: mx31_gpio_mux unsigned long reg, shift, tmp; tmp = __REG(reg); while in function: mx31_set_pad u32 field, l; void *reg; l = __raw_readl(reg); We need take the same code-style, right? field = (pin + 2) % 3; l = __raw_readl(reg); diff --git a/arch/arm/include/asm/arch-mx31/mx31.h b/arch/arm/include/asm/arch-mx31/mx31.h index 5a5aa11..a755212 100644 --- a/arch/arm/include/asm/arch-mx31/mx31.h +++ b/arch/arm/include/asm/arch-mx31/mx31.h @@ -27,6 +27,7 @@ extern u32 mx31_get_ipg_clk(void); #define imx_get_uartclk mx31_get_ipg_clk extern void mx31_gpio_mux(unsigned long mode); +extern void mx31_set_pad(enum iomux_pins pin, u32 config); void mx31_uart1_hw_init(void); void mx31_spi2_hw_init(void); -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/1] MX5: Remove dead code with ENABLE_IMPRECISE_ABORT
This code section is dead due to we never define ENABLE_IMPRECISE_ABORT for MX5 Signed-off-by: Jason Liu r64...@freescale.com --- arch/arm/cpu/armv7/mx5/lowlevel_init.S | 14 -- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/arch/arm/cpu/armv7/mx5/lowlevel_init.S b/arch/arm/cpu/armv7/mx5/lowlevel_init.S index 783c81f..e984870 100644 --- a/arch/arm/cpu/armv7/mx5/lowlevel_init.S +++ b/arch/arm/cpu/armv7/mx5/lowlevel_init.S @@ -257,20 +257,6 @@ lowlevel_init: orr r1, r1, #(1 23) str r1, [r0, #0x4] -#ifdef ENABLE_IMPRECISE_ABORT - mrs r1, spsr/* save old spsr */ - mrs r0, cpsr/* read out the cpsr */ - bic r0, r0, #0x100 /* clear the A bit */ - msr spsr, r0/* update spsr */ - add lr, pc, #0x8/* update lr */ - movs pc, lr /* update cpsr */ - nop - nop - nop - nop - msr spsr, r1/* restore old spsr */ -#endif - init_l2cc init_aips -- 1.7.0.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] QONG: fix and update board config file
Fix flash memory map and other updates for QONG board:
- adjust/fix kernel_addr settings
- adjust/fix mtdparts NOR flash settings
- add mtdparts NAND flash mapping
- sort command list
- enable setexpr command
- enable ext2 support
- delete bogus comment
Signed-off-by: Wolfgang Denk w...@denx.de
Cc: Stefano Babic sba...@denx.de
---
include/configs/qong.h | 32 ++--
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/include/configs/qong.h b/include/configs/qong.h
index f26ced1..426d90d 100644
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -102,6 +102,7 @@
#define CONFIG_USB_STORAGE
#define CONFIG_DOS_PARTITION
#define CONFIG_SUPPORT_VFAT
+#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#endif /* CONFIG_CMD_USB */
@@ -124,25 +125,16 @@
#include config_cmd_default.h
#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_PING
+#define CONFIG_CMD_DATE
#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_NET
#define CONFIG_CMD_MII
#define CONFIG_CMD_NAND
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_SPI
-#define CONFIG_CMD_DATE
-#define BOARD_LATE_INIT
-/*
- * You can compile in a MAC address and your custom net settings by using
- * the following syntax.
- *
- * #define CONFIG_ETHADDR xx:xx:xx:xx:xx:xx
- * #define CONFIG_SERVERIP server ip
- * #define CONFIG_IPADDR board ip
- * #define CONFIG_GATEWAYIPgateway ip
- * #define CONFIG_NETMASK your netmask
- */
+#define BOARD_LATE_INIT
#define CONFIG_BOOTDELAY 5
@@ -164,7 +156,7 @@
addmtd=setenv bootargs ${bootargs} ${mtdparts}\0 \
addmisc=setenv bootargs ${bootargs}\0 \
uboot_addr=A000\0 \
- kernel_addr=A00A\0\
+ kernel_addr=A00C\0\
ramdisk_addr=A030\0 \
u-boot=qong/u-boot.bin\0 \
kernel_addr_r=8080\0 \
@@ -296,10 +288,14 @@ extern int qong_nand_rdy(void *chip);
#define CONFIG_LZO
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT nor0=physmap-flash.0
+#define MTDIDS_DEFAULT nor0=physmap-flash.0, \
+ nand0=gen_nand
#define MTDPARTS_DEFAULT \
- mtdparts=physmap-flash.0:384k(U-Boot),128k(env1), \
- 128k(env2),2432k(kernel),13m(ramdisk),-(user)
+ mtdparts=physmap-flash.0: \
+ 512k(U-Boot),128k(env1),128k(env2), \
+ 2304k(kernel),13m(ramdisk),-(user); \
+ gen_nand: \
+ 128m(nand)
/* additions for new relocation code, must be added to all boards */
#define CONFIG_SYS_SDRAM_BASE 0x8000
--
1.7.2.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/2] Fix onenand command after ARM relocation changes.
Hello, After ARM relocation support the onenand command seems broken, these patches attempt to solve this issue. The first patch fixes the usage help for onenand command when no arguments are passed. The second patch relocate the onenand command table manually, I think this is required after relocation changes but I'm not sure if this is the best solution, so comments are welcome. Tested on IGEP v2 and OMAP3 IGEP module boards. Cheers, Enric $ git diff --stat origin/master arch/arm/lib/board.c |3 +++ common/cmd_onenand.c |9 + 2 files changed, 12 insertions(+), 0 deletions(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] cmd_onenand.c: Fix command usage help.
Running the onenand command without arguments does nothing, with this
patch shows the command usage.
Signed-off-by: Enric Balletbo i Serra eballe...@iseebcn.com
---
common/cmd_onenand.c |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/common/cmd_onenand.c b/common/cmd_onenand.c
index 83d967b..317968f 100644
--- a/common/cmd_onenand.c
+++ b/common/cmd_onenand.c
@@ -529,6 +529,9 @@ static int do_onenand(cmd_tbl_t * cmdtp, int flag, int
argc, char * const argv[]
{
cmd_tbl_t *c;
+ if (argc 2)
+ return cmd_usage(cmdtp);
+
mtd = onenand_mtd;
/* Strip off leading 'onenand' command argument */
--
1.7.0.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] ARM: fix relocation support for onenand device.
We also have to relocate the onenand command table manually, otherwise
onenand command don't work.
Signed-off-by: Enric Balletbo i Serra eballe...@iseebcn.com
---
arch/arm/lib/board.c |3 +++
common/cmd_onenand.c |6 ++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 108e6c4..8a981e9 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -715,6 +715,9 @@ void board_init_r (gd_t *id, ulong dest_addr)
#if defined(CONFIG_CMD_I2C)
i2c_reloc();
#endif
+#if defined(CONFIG_CMD_ONENAND)
+ onenand_reloc();
+#endif
#endif /* !defined(CONFIG_RELOC_FIXUP_WORKS) */
#ifdef CONFIG_LOGBUFFER
diff --git a/common/cmd_onenand.c b/common/cmd_onenand.c
index 317968f..5550b40 100644
--- a/common/cmd_onenand.c
+++ b/common/cmd_onenand.c
@@ -525,6 +525,12 @@ static cmd_tbl_t cmd_onenand_sub[] = {
U_BOOT_CMD_MKENT(markbad, CONFIG_SYS_MAXARGS, 0, do_onenand_markbad,
, ),
};
+#ifndef CONFIG_RELOC_FIXUP_WORKS
+void onenand_reloc(void) {
+ fixup_cmdtable(cmd_onenand_sub, ARRAY_SIZE(cmd_onenand_sub));
+}
+#endif
+
static int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char * const
argv[])
{
cmd_tbl_t *c;
--
1.7.0.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] ARM: fix relocation support for onenand device.
Hello Enric, Enric Balletbo i Serra wrote: We also have to relocate the onenand command table manually, otherwise onenand command don't work. Signed-off-by: Enric Balletbo i Serra eballe...@iseebcn.com --- arch/arm/lib/board.c |3 +++ common/cmd_onenand.c |6 ++ 2 files changed, 9 insertions(+), 0 deletions(-) Could you try git://git.denx.de/u-boot-arm.git elf_reloc branch? With this branch, it is not longer necessary to do such fixups. bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] NC650/CP650: remove code for yet another corpse
The NC650 / CP650 boards have long been unmaintained and left broken. As obviously nobody is interested in that code any more, we may as well remove it. Signed-off-by: Wolfgang Denk w...@denx.de --- MAINTAINERS |1 - board/nc650/Makefile | 45 board/nc650/flash.c | 542 -- board/nc650/nand.c | 110 - board/nc650/nc650.c | 309 board/nc650/u-boot.lds | 126 -- board/nc650/u-boot.lds.debug | 125 -- boards.cfg |3 - include/configs/NC650.h | 451 --- 9 files changed, 0 insertions(+), 1712 deletions(-) delete mode 100644 board/nc650/Makefile delete mode 100644 board/nc650/flash.c delete mode 100644 board/nc650/nand.c delete mode 100644 board/nc650/nc650.c delete mode 100644 board/nc650/u-boot.lds delete mode 100644 board/nc650/u-boot.lds.debug delete mode 100644 include/configs/NC650.h diff --git a/MAINTAINERS b/MAINTAINERS index 5108c54..86b6efe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -102,7 +102,6 @@ Wolfgang Denk w...@denx.de IVMS8_256 MPC860 LANTEC MPC850 LWMON MPC823 - NC650 MPC852 R360MPI MPC823 RMU MPC850 RRvisionMPC823 diff --git a/board/nc650/Makefile b/board/nc650/Makefile deleted file mode 100644 index e4006e7..000 --- a/board/nc650/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# (C) Copyright 2006 Detlev Zundel, d...@denx.de -# (C) Copyright 2004-2006 -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -include $(TOPDIR)/config.mk - -LIB= $(obj)lib$(BOARD).a - -COBJS = $(BOARD).o nand.o flash.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -$(LIB):$(obj).depend $(OBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) - -# - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -# diff --git a/board/nc650/flash.c b/board/nc650/flash.c deleted file mode 100644 index 8a0eab5..000 --- a/board/nc650/flash.c +++ /dev/null @@ -1,542 +0,0 @@ -/* - * (C) Copyright 2004 - * Wolfgang Denk, DENX Software Engineering, w...@denx.de. - * - * (C) Copyright 2001 - * Kyle Harris, Nexus Technologies, Inc. khar...@nexus-tech.net - * - * (C) Copyright 2001 - * Wolfgang Denk, DENX Software Engineering, w...@denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#undef DEBUG - -#include common.h -#include mpc8xx.h - -DECLARE_GLOBAL_DATA_PTR; - -#ifndef CONFIG_SYS_OR_TIMING_FLASH_AT_50MHZ -#define CONFIG_SYS_OR_TIMING_FLASH_AT_50MHZ (OR_ACS_DIV1 | OR_TRLX | OR_CSNT_SAM | \ - OR_SCY_2_CLK | OR_EHTR | OR_BI) -#endif - -flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */ - -#if defined(CONFIG_ENV_IS_IN_FLASH) -# ifndef CONFIG_ENV_ADDR -# define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET) -# endif -# ifndef CONFIG_ENV_SIZE -# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -# endif -# ifndef CONFIG_ENV_SECT_SIZE -# define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE -#
Re: [U-Boot] [PATCH 2/2] ARM: fix relocation support for onenand device.
Hello Heiko, 2010/10/19 Heiko Schocher h...@denx.de: Hello Enric, Enric Balletbo i Serra wrote: We also have to relocate the onenand command table manually, otherwise onenand command don't work. Signed-off-by: Enric Balletbo i Serra eballe...@iseebcn.com --- arch/arm/lib/board.c | 3 +++ common/cmd_onenand.c | 6 ++ 2 files changed, 9 insertions(+), 0 deletions(-) Could you try git://git.denx.de/u-boot-arm.git elf_reloc branch? Of course :-) With this branch, it is not longer necessary to do such fixups. Here my tests: U-Boot # onenand erase OneNAND erase: whole chip OK Yes, seems the patch 2/2 it's not longer necessary, the onenand command works without this patch. U-Boot # onenand (hang) I think the patch 1/2 it's also necessary, otherwise the onenand command without arguments hangs. Cheers, Enric ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] MX31: add delay between USB port setup and reset
Sometimes a usb tree is not popolated after a system reset. It seems a delay is required after setting the USB ports for the MX.31 before resetting the ehci controller. Signed-off-by: Stefano Babic sba...@denx.de --- drivers/usb/host/ehci-mxc.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c index af8ee90..8d7b380 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c @@ -117,6 +117,8 @@ int ehci_hcd_init(void) mxc_set_usbcontrol(CONFIG_MXC_USB_PORT, CONFIG_MXC_USB_FLAGS); + udelay(1); + return 0; } -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] commit powerpc: Remove warm reset entry point does not work on mpc83xx
My board has a problem with this change. I added it manually to my tree and now it wont boot at all(only with BDI2000 connected). It seems like my board uses the warm start vector at all times. Padding with 4 nop's after the _start symbol fixes the problem. It might be due to a somewhat peculiar reset design but I cannot understand why. Does this work for everyone else using 83xx? Jocke ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] omap3evm: Support relocation
This patch adds relocation support for omap3evm. Content of the patch is based on changes for Beagleboard. Signed-off-by: Sanjeev Premi pr...@ti.com --- board/ti/evm/config.mk |2 +- include/configs/omap3_evm.h |6 ++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/board/ti/evm/config.mk b/board/ti/evm/config.mk index b92d3b0..d173eef 100644 --- a/board/ti/evm/config.mk +++ b/board/ti/evm/config.mk @@ -30,4 +30,4 @@ # (mem base + reserved) # For use with external or internal boots. -CONFIG_SYS_TEXT_BASE = 0x80e8 +CONFIG_SYS_TEXT_BASE = 0x80008000 diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index c4aa220..cd38698 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -345,6 +345,12 @@ extern unsigned int boot_flash_sec; extern unsigned int boot_flash_type; #endif +/* + * 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) + /* * SMSC9115 Ethernet from SMSC9118 family * -- 1.7.2.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] i.MX31: Fix Litekit board to use new ARM relocation support.
On 10/16/2010 07:47 PM, Magnus Lilja wrote: Tested on hardware. Boots Linux nicely. Signed-off-by: Magnus Lilja lilja.mag...@gmail.com --- board/logicpd/imx31_litekit/config.mk |2 +- board/logicpd/imx31_litekit/imx31_litekit.c | 10 -- include/configs/imx31_litekit.h |7 +++ 3 files changed, 16 insertions(+), 3 deletions(-) Applied to u-boot-imx, thanks. Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V4 1/1] MX5: rename mx51 to mx5
On 10/18/2010 05:09 AM, Jason Liu wrote:
Rename mx51 to mx5 in order to support more mx51
like-style SOCs such as MX53 and the followings.
Signed-off-by: Jason Liu r64...@freescale.com
---
Changes for v2:
Address the comments from Stefano Babic:
- rebase
- remove CONFIG_CPU_TYPE
- remove copyright change
- change vision2 board config
Changes for v3:
Address the comments from Wolfgang Denk:
- Change CONFIG_HCLK_FREQ to CONFIG_SYS_MX5_HCLK
- Change CONFIG_CLK32 to CONFIG_SYS_MX5_CLK32
- Add mx5 resp. MX5 to the new identifier names.
Changes for v4:
- Remove unused is_soc_type definiton
- Change the SOC_TYPE printing message
---
Signed-off-by: Jason Liu r64...@freescale.com
---
arch/arm/cpu/armv7/{mx51 = mx5}/Makefile |0
arch/arm/cpu/armv7/{mx51 = mx5}/clock.c | 42
++--
arch/arm/cpu/armv7/{mx51 = mx5}/iomux.c |2 +-
arch/arm/cpu/armv7/{mx51 = mx5}/lowlevel_init.S |0
arch/arm/cpu/armv7/{mx51 = mx5}/soc.c | 28 -
arch/arm/cpu/armv7/{mx51 = mx5}/speed.c |0
arch/arm/cpu/armv7/{mx51 = mx5}/timer.c |8 ++--
arch/arm/cpu/armv7/{mx51 = mx5}/u-boot.lds|0
.../asm/{arch-mx51 = arch-mx5}/asm-offsets.h |0
.../include/asm/{arch-mx51 = arch-mx5}/clock.h|0
.../include/asm/{arch-mx51 = arch-mx5}/crm_regs.h |0
.../include/asm/{arch-mx51 = arch-mx5}/imx-regs.h |0
.../include/asm/{arch-mx51 = arch-mx5}/iomux.h|8 ++--
.../mx51_pins.h = arch-mx5/mx5x_pins.h} |6 +-
.../asm/{arch-mx51 = arch-mx5}/sys_proto.h|0
board/freescale/mx51evk/mx51evk.c |2 +-
board/ttcontrol/vision2/vision2.c |2 +-
boards.cfg |4 +-
include/configs/mx51evk.h |4 +-
include/configs/vision2.h |4 +-
20 files changed, 58 insertions(+), 52 deletions(-)
Applied to u-boot-imx, thanks
Best regards,
Stefano Babic
--
=
DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de
=
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] MX31: add delay between USB port setup and reset
On 10/19/2010 12:02 PM, Stefano Babic wrote: Sometimes a usb tree is not popolated after a system reset. It seems a delay is required after setting the USB ports for the MX.31 before resetting the ehci controller. Signed-off-by: Stefano Babic sba...@denx.de --- drivers/usb/host/ehci-mxc.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Applied to u-boot-imx, thanks Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/1] MX5: Remove dead code with ENABLE_IMPRECISE_ABORT
On 10/19/2010 10:22 AM, Jason Liu wrote: This code section is dead due to we never define ENABLE_IMPRECISE_ABORT for MX5 Signed-off-by: Jason Liu r64...@freescale.com --- arch/arm/cpu/armv7/mx5/lowlevel_init.S | 14 -- 1 files changed, 0 insertions(+), 14 deletions(-) Applied to u-boot-imx, thanks. Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] arm926ejs, suen3: fix relocation issues
Maybe, Eric (added to cc: ) should also try to do early things (like kirkwood_mpp_conf()) in board_early_init_f() as I on the suen3? I will try this and let you know. But the most helpful data point for me would be whether display_banner etc. currently works on a SheevaPlug, which is almost identical to the DockStar. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Writing to Flash. ..Error
Hello, I am working with coldfire 5485 processor. this board is showing a problem in uboot When I am saving changes to the flash I am getting these error Writing to Flash... Flash buffer write error at address ff802000 Command Sequence Error. Block locked. Vpp Low Error. Can't write to protected Flash sectors Could any one help me out on this problem regards, Balan ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] arm926ejs, suen3: fix relocation issues
-Original Message- From: Eric Cooper [mailto:e...@cmu.edu] Sent: Tuesday, October 19, 2010 4:14 PM To: Heiko Schocher Cc: Prafulla Wadaskar; u-boot@lists.denx.de Subject: Re: [PATCH] arm926ejs, suen3: fix relocation issues Maybe, Eric (added to cc: ) should also try to do early things (like kirkwood_mpp_conf()) in board_early_init_f() as I on the suen3? I will try this and let you know. But the most helpful data point for me would be whether display_banner etc. currently works on a SheevaPlug, which is almost identical to the DockStar. Hi Eric I checked on Sheevaplug, but sheevaplug has usb-UART interface, that does not help to test this. Since by the time UART is up board is in booted state. There is anther way to test this, erase native u-boot and check from boot from DRAM, I have not tested this yet. But I think this must be problem on sheevaplug too ? Regards.. Prafulla . . -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] mx51evk build failure
On 10/19/2010 12:50 PM, Loïc Minier wrote: Hey there I'm following the u-boot list and see that some mx5 changes are being pushed regularly to u-boot.git master, but the board doesn't build for me (make CROSS_COMPILE=arm-linux-gnueabi- mrproper mx51evk_config + make CROSS_COMPILE=arm-linux-gnueabi- all), it fails with board.c:459: error: ‘CONFIG_SYS_SDRAM_BASE’ undeclared; I guess this is because the board needs porting to the relocation changes? Yes. I have at least a patch that fix the compiling issues and I could test on a 2.5 board. However, it sets still CONFIG_SYS_ARM_WITHOUT_RELOC. Hoever, it is ugly that the board does not compile, and I weill send in anyway the patch to the ML. I just wonder how the various patches related to mx5 get built; do you revert the relocation changes locally as a workaround before build? No. There is a second MX5 board in mainline, that I used for testing. Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] QONG: fix and update board config file
On 10/19/2010 11:10 AM, Wolfgang Denk wrote: Fix flash memory map and other updates for QONG board: - adjust/fix kernel_addr settings - adjust/fix mtdparts NOR flash settings - add mtdparts NAND flash mapping - sort command list - enable setexpr command - enable ext2 support - delete bogus comment Signed-off-by: Wolfgang Denk w...@denx.de Cc: Stefano Babic sba...@denx.de Applied to u-boot-imx, thanks. Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] MX51: fix mx51evk board, add environment to MMC
The patch fixes the compilation of the mx51evk board
with the actual u-boot release and stores the
environment into the MMC card.
Signed-off-by: Stefano Babic sba...@denx.de
---
board/freescale/mx51evk/mx51evk.c | 20
include/configs/mx51evk.h | 37 ++---
2 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/board/freescale/mx51evk/mx51evk.c
b/board/freescale/mx51evk/mx51evk.c
index c8d7d39..d6bb71c 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -52,9 +52,14 @@ u32 get_board_rev(void)
int dram_init(void)
{
+#ifdef CONFIG_SYS_ARM_WITHOUT_RELOC
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);
+#else
+ gd-ram_size = get_ram_size((long *)PHYS_SDRAM_1,
+ PHYS_SDRAM_1_SIZE);
+#endif
return 0;
}
@@ -399,16 +404,25 @@ int board_mmc_init(bd_t *bis)
}
#endif
+int board_early_init_f(void)
+{
+ setup_iomux_uart();
+ setup_iomux_fec();
+
+ return 0;
+}
+
int board_init(void)
{
system_rev = get_cpu_rev();
+#ifdef CONFIG_SYS_ARM_WITHOUT_RELOC
+ board_early_init_f();
+#endif
gd-bd-bi_arch_number = MACH_TYPE_MX51_BABBAGE;
/* address of boot parameters */
gd-bd-bi_boot_params = PHYS_SDRAM_1 + 0x100;
- setup_iomux_uart();
- setup_iomux_fec();
return 0;
}
@@ -416,10 +430,8 @@ int board_init(void)
#ifdef BOARD_LATE_INIT
int board_late_init(void)
{
-#ifdef CONFIG_MXC_SPI
setup_iomux_spi();
power_init();
-#endif
return 0;
}
#endif
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 6165473..13808a4 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -28,7 +28,6 @@
/* High Level Configuration Options */
#define CONFIG_MX51/* in a mx51 */
-#define CONFIG_SKIP_RELOCATE_UBOOT
#define CONFIG_SYS_MX5_HCLK2400
#define CONFIG_SYS_MX5_CLK32 32768
@@ -55,6 +54,7 @@
#define CONFIG_SYS_GBL_DATA_SIZE 128
#define BOARD_LATE_INIT
+#define CONFIG_BOARD_EARLY_INIT_F
/*
* Hardware drivers
@@ -75,6 +75,14 @@
#define CONFIG_FSL_PMIC_CLK250
#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)
+#define CONFIG_CMD_SF
+#define CONFIG_SPI_FLASH
+#define CONFIG_SPI_FLASH_ATMEL
+#define CONFIG_SPI_FLASH_CS1
+#define CONFIG_ENV_SPI_CS 1
+#define CONFIG_ENV_SPI_MAX_HZ 250
+#define CONFIG_ENV_SPI_MODESPI_MODE_0
+
/*
* MMC Configs
* */
@@ -178,13 +186,36 @@
#define CONFIG_SYS_DDR_CLKSEL 0
#define CONFIG_SYS_CLKTL_CBCDR 0x59E35100
+#define CONFIG_SYS_SDRAM_BASE 0x9000
+#define CONFIG_SYS_INIT_RAM_ADDR 0x1FFE8000
+
+#ifndef CONFIG_SYS_ARM_WITHOUT_RELOC
+#define CONFIG_SYS_INIT_RAM_END(64 * 1024)
+#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - \
+ CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_ADDR(CONFIG_SYS_INIT_RAM_ADDR + \
+ CONFIG_SYS_GBL_DATA_OFFSET)
+#undef CONFIG_SKIP_RELOCATE_UBOOT
+#else
+#define CONFIG_SKIP_RELOCATE_UBOOT
+#define CONFIG_SYS_INIT_SP_ADDR(CONFIG_SYS_INIT_RAM_ADDR +
0x2000)
+#endif
+
+
/*---
* FLASH and environment organization
*/
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_SECT_SIZE(128 * 1024)
-#define CONFIG_ENV_SIZECONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
+#define CONFIG_ENV_SECT_SIZE (1 * 64 * 1024)
+#define CONFIG_ENV_SIZE(4 * 1024)
+
+#if 0
#define CONFIG_ENV_IS_NOWHERE
+#else
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV 0
+#endif
#endif
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ftrtc010.c : enhance code according to original datasheet
Add missing codes according to original datasheet.
This patch also makes ftrtc010 could be adapted to PCLK and EXT_CLK.
Signed-off-by: Macpaul Lin macp...@andestech.com
---
drivers/rtc/ftrtc010.c | 11 +++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/drivers/rtc/ftrtc010.c b/drivers/rtc/ftrtc010.c
index 7738a7a..25e4a7b 100644
--- a/drivers/rtc/ftrtc010.c
+++ b/drivers/rtc/ftrtc010.c
@@ -34,6 +34,13 @@ struct ftrtc010 {
unsigned int alarm_hour;/* 0x18 */
unsigned int record;/* 0x1c */
unsigned int cr;/* 0x20 */
+ unsigned int wsec; /* 0x24 */
+ unsigned int wmin; /* 0x28 */
+ unsigned int whour; /* 0x2c */
+ unsigned int wday; /* 0x30 */
+ unsigned int intr; /* 0x34 */
+ unsigned int div; /* 0x38 */
+ unsigned int rev; /* 0x3c */
};
/*
@@ -85,7 +92,11 @@ int rtc_get(struct rtc_time *tmp)
debug(%s(): record register: %x\n,
__func__, readl(rtc-record));
+#ifdef CONFIG_FTRTC010_PCLK
+ now = (ftrtc010_time() + readl(rtc-record)) / RTC_DIV_COUNT;
+#else /* CONFIG_FTRTC010_EXTCLK */
now = ftrtc010_time() + readl(rtc-record);
+#endif
to_tm(now, tmp);
--
1.7.2.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2] MX51: fix mx51evk board, add environment to MMC
The patch fixes the compilation of the mx51evk board
with the actual u-boot release and stores the
environment into the MMC card.
Signed-off-by: Stefano Babic sba...@denx.de
---
Changes since V1:
- Dead code not removed
board/freescale/mx51evk/mx51evk.c | 20
include/configs/mx51evk.h | 27 +++
2 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/board/freescale/mx51evk/mx51evk.c
b/board/freescale/mx51evk/mx51evk.c
index c8d7d39..d6bb71c 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -52,9 +52,14 @@ u32 get_board_rev(void)
int dram_init(void)
{
+#ifdef CONFIG_SYS_ARM_WITHOUT_RELOC
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);
+#else
+ gd-ram_size = get_ram_size((long *)PHYS_SDRAM_1,
+ PHYS_SDRAM_1_SIZE);
+#endif
return 0;
}
@@ -399,16 +404,25 @@ int board_mmc_init(bd_t *bis)
}
#endif
+int board_early_init_f(void)
+{
+ setup_iomux_uart();
+ setup_iomux_fec();
+
+ return 0;
+}
+
int board_init(void)
{
system_rev = get_cpu_rev();
+#ifdef CONFIG_SYS_ARM_WITHOUT_RELOC
+ board_early_init_f();
+#endif
gd-bd-bi_arch_number = MACH_TYPE_MX51_BABBAGE;
/* address of boot parameters */
gd-bd-bi_boot_params = PHYS_SDRAM_1 + 0x100;
- setup_iomux_uart();
- setup_iomux_fec();
return 0;
}
@@ -416,10 +430,8 @@ int board_init(void)
#ifdef BOARD_LATE_INIT
int board_late_init(void)
{
-#ifdef CONFIG_MXC_SPI
setup_iomux_spi();
power_init();
-#endif
return 0;
}
#endif
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 6165473..291404c 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -28,7 +28,6 @@
/* High Level Configuration Options */
#define CONFIG_MX51/* in a mx51 */
-#define CONFIG_SKIP_RELOCATE_UBOOT
#define CONFIG_SYS_MX5_HCLK2400
#define CONFIG_SYS_MX5_CLK32 32768
@@ -55,6 +54,7 @@
#define CONFIG_SYS_GBL_DATA_SIZE 128
#define BOARD_LATE_INIT
+#define CONFIG_BOARD_EARLY_INIT_F
/*
* Hardware drivers
@@ -178,13 +178,32 @@
#define CONFIG_SYS_DDR_CLKSEL 0
#define CONFIG_SYS_CLKTL_CBCDR 0x59E35100
+#define CONFIG_SYS_SDRAM_BASE 0x9000
+#define CONFIG_SYS_INIT_RAM_ADDR 0x1FFE8000
+
+#ifndef CONFIG_SYS_ARM_WITHOUT_RELOC
+#define CONFIG_SYS_INIT_RAM_END(64 * 1024)
+#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - \
+ CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_ADDR(CONFIG_SYS_INIT_RAM_ADDR + \
+ CONFIG_SYS_GBL_DATA_OFFSET)
+#undef CONFIG_SKIP_RELOCATE_UBOOT
+#else
+#define CONFIG_SKIP_RELOCATE_UBOOT
+#define CONFIG_SYS_INIT_SP_ADDR(CONFIG_SYS_INIT_RAM_ADDR +
0x2000)
+#endif
+
+
/*---
* FLASH and environment organization
*/
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_SECT_SIZE(128 * 1024)
-#define CONFIG_ENV_SIZECONFIG_ENV_SECT_SIZE
-#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
+#define CONFIG_ENV_SECT_SIZE (1 * 64 * 1024)
+#define CONFIG_ENV_SIZE(4 * 1024)
+
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV 0
#endif
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] MX51: fix mx51evk board, add environment to MMC
Dear Stefano Babic,
In message 1287490415-24200-1-git-send-email-sba...@denx.de you wrote:
The patch fixes the compilation of the mx51evk board
with the actual u-boot release and stores the
environment into the MMC card.
Signed-off-by: Stefano Babic sba...@denx.de
---
board/freescale/mx51evk/mx51evk.c | 20
include/configs/mx51evk.h | 37
++---
2 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/board/freescale/mx51evk/mx51evk.c
b/board/freescale/mx51evk/mx51evk.c
index c8d7d39..d6bb71c 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -52,9 +52,14 @@ u32 get_board_rev(void)
int dram_init(void)
{
+#ifdef CONFIG_SYS_ARM_WITHOUT_RELOC
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);
+#else
+ gd-ram_size = get_ram_size((long *)PHYS_SDRAM_1,
+ PHYS_SDRAM_1_SIZE);
+#endif
return 0;
}
We should not support the CONFIG_SYS_ARM_WITHOUT_RELOC compatibility
mode any longer than absolutely necessary. If the other code works,
then please remove the #ifdef CONFIG_SYS_ARM_WITHOUT_RELOC parts.
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: w...@denx.de
It is better to marry than to burn.
- Bible ``I Corinthians'' ch. 7, v. 9
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2] MX51: fix mx51evk board, add environment to MMC
Dear Stefano Babic,
In message 1287491115-6312-1-git-send-email-sba...@denx.de you wrote:
The patch fixes the compilation of the mx51evk board
with the actual u-boot release and stores the
environment into the MMC card.
Signed-off-by: Stefano Babic sba...@denx.de
---
Changes since V1:
- Dead code not removed
board/freescale/mx51evk/mx51evk.c | 20
include/configs/mx51evk.h | 27 +++
2 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/board/freescale/mx51evk/mx51evk.c
b/board/freescale/mx51evk/mx51evk.c
index c8d7d39..d6bb71c 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -52,9 +52,14 @@ u32 get_board_rev(void)
int dram_init(void)
{
+#ifdef CONFIG_SYS_ARM_WITHOUT_RELOC
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);
+#else
+ gd-ram_size = get_ram_size((long *)PHYS_SDRAM_1,
+ PHYS_SDRAM_1_SIZE);
+#endif
return 0;
Please get rid of the references to CONFIG_SYS_ARM_WITHOUT_RELOC
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: w...@denx.de
In Nature there are neither rewards nor punishments, there are conse-
quences.-- R.G. Ingersoll
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Add UBI README
This patch adds a small README to describe the usage of the U-Boot UBI commands. Signed-off-by: Stefan Roese s...@denx.de --- doc/README.ubi | 144 1 files changed, 144 insertions(+), 0 deletions(-) create mode 100644 doc/README.ubi diff --git a/doc/README.ubi b/doc/README.ubi new file mode 100644 index 000..da2dfac --- /dev/null +++ b/doc/README.ubi @@ -0,0 +1,144 @@ +--- +UBI usage in U-Boot +--- + +Here the list of the currently implemented UBI commands: + += help ubi +ubi - ubi commands + +Usage: +ubi part [part] [offset] + - Show or set current partition (with optional VID header offset) +ubi info [l[ayout]] - Display volume and ubi layout information +ubi create[vol] volume [size] [type] - create volume name with size +ubi write[vol] address volume size - Write volume from address with size +ubi read[vol] address volume [size] - Read volume to address with size +ubi remove[vol] volume - Remove volume +[Legends] + volume: character name + size: specified in bytes + type: s[tatic] or d[ynamic] (default=dynamic) + + +The first command that is needed to be issues is ubi part to connect +one mtd partition to the UBI subsystem. This command will either create +a new UBI device on the requested MTD partition. Or it will attach a +previously created UBI device. The other UBI commands will only work +when such a UBI device is attached (via ubi part). Here an example: + += mtdparts + +device nor0 1fc00.nor_flash, # parts = 6 + #: namesizeoffset mask_flags + 0: kernel 0x0020 0x 0 + 1: dtb 0x0004 0x0020 0 + 2: root0x0020 0x0024 0 + 3: user0x01ac 0x0044 0 + 4: env 0x0008 0x01f0 0 + 5: u-boot 0x0008 0x01f8 0 + +active partition: nor0,0 - (kernel) 0x0020 @ 0x + +defaults: +mtdids : nor0=1fc00.nor_flash +mtdparts: mtdparts=1fc00.nor_flash:2m(kernel),256k(dtb),2m(root),27392k(user),512k(env),512k(u-boot) + += ubi part root +Creating 1 MTD partitions on nor0: +0x0024-0x0044 : mtd=2 +UBI: attaching mtd1 to ubi0 +UBI: physical eraseblock size: 262144 bytes (256 KiB) +UBI: logical eraseblock size:262016 bytes +UBI: smallest flash I/O unit:1 +UBI: VID header offset: 64 (aligned 64) +UBI: data offset:128 +UBI: attached mtd1 to ubi0 +UBI: MTD device name:mtd=2 +UBI: MTD device size:2 MiB +UBI: number of good PEBs:8 +UBI: number of bad PEBs: 0 +UBI: max. allowed volumes: 128 +UBI: wear-leveling threshold:4096 +UBI: number of internal volumes: 1 +UBI: number of user volumes: 1 +UBI: available PEBs: 0 +UBI: total number of reserved PEBs: 8 +UBI: number of PEBs reserved for bad PEB handling: 0 +UBI: max/mean erase counter: 2/1 + + +Now that the UBI device is attached, this device can be modified +using the following commands: + +ubi info Display volume and ubi layout information +ubi createvol Create UBI volume on UBI device +ubi removevol Remove UBI volume from UBI device +ubi read Read data from UBI volume to memory +ubi write Write data from memory to UBI volume + + +Here a few examples on the usage: + += ubi create testvol +Creating dynamic volume testvol of size 1048064 + += ubi info l +UBI: volume information dump: +UBI: vol_id 0 +UBI: reserved_pebs 4 +UBI: alignment 1 +UBI: data_pad0 +UBI: vol_type3 +UBI: name_len7 +UBI: usable_leb_size 262016 +UBI: used_ebs4 +UBI: used_bytes 1048064 +UBI: last_eb_bytes 262016 +UBI: corrupted 0 +UBI: upd_marker 0 +UBI: nametestvol + +UBI: volume information dump: +UBI: vol_id 2147479551 +UBI: reserved_pebs 2 +UBI: alignment 1 +UBI: data_pad0 +UBI: vol_type3 +UBI: name_len13 +UBI: usable_leb_size 262016 +UBI: used_ebs2 +UBI: used_bytes 524032 +UBI: last_eb_bytes 2 +UBI: corrupted 0 +UBI: upd_marker 0 +UBI: namelayout volume + += ubi info +UBI: MTD device name:mtd=2 +UBI: MTD device size:2 MiB +UBI: physical eraseblock size: 262144 bytes (256 KiB) +UBI: logical eraseblock size:262016 bytes +UBI: number of good PEBs:8 +UBI: number of bad PEBs: 0 +UBI: smallest flash I/O unit:1 +UBI: VID header offset: 64 (aligned 64) +UBI: data offset:128 +UBI: max. allowed volumes: 128 +UBI: wear-leveling threshold:4096 +UBI: number of internal volumes: 1 +UBI: number of user volumes: 1 +UBI: available PEBs: 0 +UBI: total number of reserved PEBs: 8 +UBI: number of PEBs reserved for bad PEB handling: 0 +UBI: max/mean erase counter: 4/1 + += ubi write 80
[U-Boot] Error during NAND access
Hi, I have strange phenomena. I have DM365 baaed board. In some boards (Not all of them), I get this strange case: Accessing the NAND (Erase/write), like with saveenv command, followed by Ethernet access (TFTP/PING) stuck the SW. Accessing the NAND without prior access to ETHERNET works fine. I tried to debug this with TI code composer studio. When accessing the NAND, it seems that the CPUs data bus is hung, and I get the following message from code composer: Warning: 0x4020/-1032 @ marker 1022 Warning during: Execution, The pipeline is stalled owing to 'data bus not ready' Did you ever encounter such a problem? Do you know if it is caused by HW problem (Corrupt NAND/DM365), or a fixable SW bug? Thanks in advance Alex -- View this message in context: http://old.nabble.com/Error-during-NAND-access-tp2994p2994.html Sent from the Uboot - Users mailing list archive at Nabble.com. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] omap3evm: Wrap function under CONFIG_USB_OMAP3
The function omap3_evm_need_extvbus() is required only when USB support is configured. Wrapped this function in #ifdef CONFIG_USB_OMAP3. Signed-off-by: Sanjeev Premi pr...@ti.com --- board/ti/evm/evm.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index 9948b9c..73330db 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -64,6 +64,7 @@ static void omap3_evm_get_revision(void) } } +#ifdef CONFIG_USB_OMAP3 /* * MUSB port on OMAP3EVM Rev = E requires extvbus programming. */ @@ -76,6 +77,7 @@ u8 omap3_evm_need_extvbus(void) return retval; } +#endif /* * Routine: board_init -- 1.7.2.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] omap3evm: Move function to identify board revision
Function omap3_evm_get_revision() - to identify the board revision was called at end of setup_net_chip(). Board revision can be ascertained only by identifying the Ethernet chipset - but combining setup operations with revision detection isn;t a good idea. Moved the function and added detailed comment to set the context. Signed-off-by: Sanjeev Premi pr...@ti.com --- board/ti/evm/evm.c |9 ++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index 73330db..6163b12 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -109,6 +109,12 @@ int misc_init_r(void) #if defined(CONFIG_CMD_NET) setup_net_chip(); + + /* +* Board revision can be ascertained only by identifying +* the Ethernet chipset. +*/ + omap3_evm_get_revision(); #endif dieid_num_r(); @@ -163,9 +169,6 @@ static void setup_net_chip(void) writel(GPIO0, gpio3_base-cleardataout); udelay(1); writel(GPIO0, gpio3_base-setdataout); - - /* determine omap3evm revision */ - omap3_evm_get_revision(); } int board_eth_init(bd_t *bis) -- 1.7.2.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] kirkwood: Fix Makefile TEXT_BASE for mkimage
Signed-off-by: Gray Remlin g_rem...@rocketmail.com --- Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 30a564d..a3136da 100644 --- a/Makefile +++ b/Makefile @@ -341,7 +341,7 @@ $(obj)u-boot.imx: $(obj)u-boot.bin $(obj)u-boot.kwb: $(obj)u-boot.bin $(obj)tools/mkimage -n $(KWD_CONFIG) -T kwbimage \ - -a $(CONFIG_SYS_TEXT_BASE) -e $(TEXT_BASE) -d $ $@ + -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $ $@ $(obj)u-boot.sha1: $(obj)u-boot.bin $(obj)tools/ubsha1 $(obj)u-boot.bin -- ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] kirkwood: Fix uninitialised DRAM struct
Breaking out of the loop leaves the rest of the struct uninitialised Signed-off-by: Gray Remlin g_rem...@rocketmail.com --- arch/arm/cpu/arm926ejs/kirkwood/dram.c |7 ++- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/kirkwood/dram.c b/arch/arm/cpu/arm926ejs/kirkwood/dram.c index 7439c87..50bed63 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/dram.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/dram.c @@ -75,11 +75,8 @@ int dram_init(void) * If the gap is found, ram_size will be reported for * consecutive memory only */ - if (gd-bd-bi_dram[i].start != gd-ram_size) - break; - - gd-ram_size += gd-bd-bi_dram[i].size; - + if (gd-bd-bi_dram[i].start == gd-ram_size) + gd-ram_size += gd-bd-bi_dram[i].size; } return 0; } -- ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Support for sending DHCP client options
Signed-off-by: Gray Remlin g_rem...@rocketmail.com
---
README |7 ++
common/cmd_nvedit.c |3 ++
net/bootp.c | 52
+++
tools/env/fw_env.c |4 ++-
4 files changed, 65 insertions(+), 1 deletions(-)
diff --git a/README b/README
index a52f3bf..90da375 100644
--- a/README
+++ b/README
@@ -1279,6 +1279,7 @@ The following options need to be configured:
CONFIG_BOOTP_NTPSERVER
CONFIG_BOOTP_TIMEOFFSET
CONFIG_BOOTP_VENDOREX
+ CONFIG_BOOTP_OPTIONS
CONFIG_BOOTP_SERVERIP - TFTP server will be the serverip
environment variable, not the BOOTP server.
@@ -1299,6 +1300,12 @@ The following options need to be configured:
of the hostname environment variable is passed as
option 12 to the DHCP server.
+ CONFIG_BOOTP_OPTIONS - The environment is checked for the
+ supported DHCPv4 client options (prefixed with dhcp_), any
+ found are sent during a DHCP Discover and DHCP Request.
+ The DHCP server can use this information to conditionally
+ tailor it's response.
+
CONFIG_BOOTP_DHCP_REQUEST_DELAY
A 32bit value in microseconds for a delay between
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 3d30c32..2094e8e 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -224,6 +224,9 @@ int _do_env_set (int flag, int argc, char * const
argv[])
if (ep) { /* variable exists */
#ifndef CONFIG_ENV_OVERWRITE
if ((strcmp (name, serial#) == 0) ||
+#if defined(CONFIG_BOOTP_OPTIONS)
+ (strcmp(name, dhcp_vendor-class-identifier) == 0) ||
+#endif /* CONFIG_BOOTP_OPTIONS */
((strcmp (name, ethaddr) == 0)
#if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) defined(CONFIG_ETHADDR)
(strcmp (ep-data,MK_STR(CONFIG_ETHADDR)) != 0)
diff --git a/net/bootp.c b/net/bootp.c
index 1289e3b..9e687b0 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -68,6 +68,54 @@ extern u8 *dhcp_vendorex_prep (u8 *e); /*rtn new e
after add own opts. */
extern u8 *dhcp_vendorex_proc (u8 *e); /*rtn next e if mine,else NULL */
#endif
+#if defined(CONFIG_BOOTP_OPTIONS) /* check environment for dhcp client
options */
+
+/*
+ * The vendor-specifiable options should not be changeable
+ * unless CONFIG_ENV_OVERWRITE has been defined, however
+ * user-specifiable options should be changeable regardless
+ */
+u8 dhcp_options_prep(u8 **ep)
+{
+ u8 *e = *ep;
+ char *ptr;
+
+ debug(DHCP Client options start\n);
+
+ /* vendor-specifiable identification string */
+ if ((ptr = getenv(dhcp_vendor-class-identifier))) {
+ debug(dhcp_vendor-class-identifier=%s\n,ptr);
+ *e++ = 60;
+ *e++ = strlen(ptr);
+ while (*ptr)
+ *e++ = *ptr++;
+ }
+
+ /* user-specifiable identification string */
+ if ((ptr = getenv(dhcp_dhcp-client-identifier))) {
+ debug(dhcp_dhcp-client-identifier=%s\n,ptr);
+ *e++ = 61;
+ *e++ = strlen(ptr);
+ while (*ptr)
+ *e++ = *ptr++;
+ }
+
+ /* user-specifiable identification string */
+ if ((ptr = getenv(dhcp_user-class))) {
+ debug(dhcp_user-class=%s\n,ptr);
+ *e++ = 77;
+ *e++ = strlen(ptr);
+ while (*ptr)
+ *e++ = *ptr++;
+ }
+
+ debug(DHCP Client options end\n);
+ *ep = e;
+ return e;
+}
+
+#endif /* CONFIG_BOOTP_OPTIONS */
+
#endif
static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src,
unsigned len)
@@ -412,6 +460,10 @@ static int DhcpExtended (u8 * e, int message_type,
IPaddr_t ServerID, IPaddr_t R
}
#endif
+#if defined(CONFIG_BOOTP_OPTIONS)
+ dhcp_options_prep (e);
+#endif
+
#if defined(CONFIG_BOOTP_VENDOREX)
if ((x = dhcp_vendorex_prep (e)))
return x - start;
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index 8ff7052..ae37d15 100644
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -391,9 +391,11 @@ int fw_env_write(char *name, char *value)
*/
if (oldval) {
/*
-* Ethernet Address and serial# can be set only once
+* Ethernet Address, vendor DHCP options,
+* and serial# can be set only once
*/
if ((strcmp (name, ethaddr) == 0) ||
+ (strcmp(name, dhcp_vendor-class-identifier) ==
0) ||
(strcmp (name, serial#) == 0)) {
fprintf (stderr, Can't overwrite \%s\\n, name);
errno = EROFS;
--
___
U-Boot mailing list
Re: [U-Boot] [PATCH 0/3] new BSP for at91rm9200ek
Dear Andreas Bießmann, This patch series introduce new board support for at91rm9200ek. The derived code is now converted to new at91 code. Arm relocation is also implemented. There where some tradeoffs regarding device support. Currently the code basis does not support all devices supported before. This includes a) remove support for dataflash since i can not test it (yet, should follow in some weeks) b) preloader support is disabled since NOR booting does not need any first stage loader c) MMC/SD-card is currently not supported (but was not before) Next steps are: - get dataflash running - remove at91rm9200_usart driver (should merge with atmel_usart) - support MMC/SD-Card (also merge with current AT91/AVR32 implementation) - merge emac/macb Andreas Bießmann (3): at91rm9200ek: convert to at91 at91rm9200: enable USB support at91rm9200ek: enbable USB support MAINTAINERS |4 + arch/arm/include/asm/arch-at91/hardware.h |1 + board/atmel/at91rm9200ek/Makefile |1 - board/atmel/at91rm9200ek/at91rm9200ek.c | 58 ++- board/atmel/at91rm9200ek/config.mk|3 +- board/atmel/at91rm9200ek/led.c| 58 board/atmel/at91rm9200ek/misc.c | 50 -- boards.cfg|2 +- include/configs/at91rm9200ek.h| 233 - 9 files changed, 118 insertions(+), 292 deletions(-) delete mode 100644 board/atmel/at91rm9200ek/misc.c Added V2 of the series to u-boot-atmel/at91. Thanks, Reinhard ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] AT91 clock/timer: move static data to global_data struct
Reinhard Meyer schrieb: clock.c / timer.c used static data and are called before relocation. Move all static variables into global_data structure. Also cleanup timer.c from unused stubs and make it truly use 64 bit tick values. Signed-off-by: Reinhard Meyer u-b...@emk-elektronik.de --- arch/arm/cpu/arm926ejs/at91/clock.c | 55 +++--- arch/arm/cpu/arm926ejs/at91/timer.c | 85 +-- arch/arm/include/asm/global_data.h | 14 ++ 3 files changed, 83 insertions(+), 71 deletions(-) Applied to u-boot-atmel.git/at91. Thanks, Reinhard ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Fix potential empty DHCP Parameter Request List
Signed-off-by: Gray Remlin g_rem...@rocketmail.com --- net/bootp.c | 16 +++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/net/bootp.c b/net/bootp.c index e679f8b..1289e3b 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -417,8 +417,21 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R return x - start; #endif +/* + * RFC2132: An empty Parameter Request List is not legitimate, + * it must have at minimum one request. + */ +#if defined(CONFIG_BOOTP_SUBNETMASK) || \ +defined(CONFIG_BOOTP_TIMEOFFSET) || \ +defined(CONFIG_BOOTP_GATEWAY) || \ +defined(CONFIG_BOOTP_DNS) || \ +defined(CONFIG_BOOTP_HOSTNAME) || \ +defined(CONFIG_BOOTP_BOOTFILESIZE) || \ +defined(CONFIG_BOOTP_BOOTPATH) || \ +defined(CONFIG_BOOTP_NISDOMAIN) || \ +defined(CONFIG_BOOTP_NTPSERVER) *e++ = 55; /* Parameter Request List */ -cnt = e++; /* Pointer to count of requested items */ + cnt = e++; /* Pointer to count of requested items */ *cnt = 0; #if defined(CONFIG_BOOTP_SUBNETMASK) *e++ = 1; /* Subnet Mask */ @@ -456,6 +469,7 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R *e++ = 42; *cnt += 1; #endif +#endif *e++ = 255;/* End of the list */ /* Pad to minimal length */ -- ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [GIT PULL] Pull request: u-boot-imx
Hi Wolfgang,
please pull from u-boot-imx.
The following changes since commit cacc342d5aa311673efdc05770cb53246dd41c9f:
Merge branch 'master' of git://git.denx.de/u-boot-arm (2010-10-17
20:25:05 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-imx master
Jason Liu (2):
MX5: rename mx51 to mx5
MX5: Remove dead code with ENABLE_IMPRECISE_ABORT
Magnus Lilja (1):
i.MX31: Fix Litekit board to use new ARM relocation support.
Stefano Babic (1):
MX31: add delay between USB port setup and reset
Wolfgang Denk (1):
QONG: fix and update board config file
arch/arm/cpu/armv7/{mx51 = mx5}/Makefile |0
arch/arm/cpu/armv7/{mx51 = mx5}/clock.c | 42
++--
arch/arm/cpu/armv7/{mx51 = mx5}/iomux.c |2 +-
arch/arm/cpu/armv7/{mx51 = mx5}/lowlevel_init.S | 14 ---
arch/arm/cpu/armv7/{mx51 = mx5}/soc.c | 28 -
arch/arm/cpu/armv7/{mx51 = mx5}/speed.c |0
arch/arm/cpu/armv7/{mx51 = mx5}/timer.c |8 ++--
arch/arm/cpu/armv7/{mx51 = mx5}/u-boot.lds|0
.../asm/{arch-mx51 = arch-mx5}/asm-offsets.h |0
.../include/asm/{arch-mx51 = arch-mx5}/clock.h|0
.../include/asm/{arch-mx51 = arch-mx5}/crm_regs.h |0
.../include/asm/{arch-mx51 = arch-mx5}/imx-regs.h |0
.../include/asm/{arch-mx51 = arch-mx5}/iomux.h|8 ++--
.../mx51_pins.h = arch-mx5/mx5x_pins.h} |6 +-
.../asm/{arch-mx51 = arch-mx5}/sys_proto.h|0
board/freescale/mx51evk/mx51evk.c |2 +-
board/logicpd/imx31_litekit/config.mk |2 +-
board/logicpd/imx31_litekit/imx31_litekit.c| 10 -
board/ttcontrol/vision2/vision2.c |2 +-
boards.cfg |4 +-
drivers/usb/host/ehci-mxc.c|2 +
include/configs/imx31_litekit.h|7 +++
include/configs/mx51evk.h |4 +-
include/configs/qong.h | 32 +++
include/configs/vision2.h |4 +-
25 files changed, 90 insertions(+), 87 deletions(-)
rename arch/arm/cpu/armv7/{mx51 = mx5}/Makefile (100%)
rename arch/arm/cpu/armv7/{mx51 = mx5}/clock.c (85%)
rename arch/arm/cpu/armv7/{mx51 = mx5}/iomux.c (99%)
rename arch/arm/cpu/armv7/{mx51 = mx5}/lowlevel_init.S (95%)
rename arch/arm/cpu/armv7/{mx51 = mx5}/soc.c (81%)
rename arch/arm/cpu/armv7/{mx51 = mx5}/speed.c (100%)
rename arch/arm/cpu/armv7/{mx51 = mx5}/timer.c (92%)
rename arch/arm/cpu/armv7/{mx51 = mx5}/u-boot.lds (100%)
rename arch/arm/include/asm/{arch-mx51 = arch-mx5}/asm-offsets.h (100%)
rename arch/arm/include/asm/{arch-mx51 = arch-mx5}/clock.h (100%)
rename arch/arm/include/asm/{arch-mx51 = arch-mx5}/crm_regs.h (100%)
rename arch/arm/include/asm/{arch-mx51 = arch-mx5}/imx-regs.h (100%)
rename arch/arm/include/asm/{arch-mx51 = arch-mx5}/iomux.h (98%)
rename arch/arm/include/asm/{arch-mx51/mx51_pins.h =
arch-mx5/mx5x_pins.h} (99%)
rename arch/arm/include/asm/{arch-mx51 = arch-mx5}/sys_proto.h (100%)
--
=
DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de
=
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] USB: sync Queue Element Transfer Descriptor against EHCI spec
Appendix B EHCI 64-Bit Data Structures of the Enhanced Host
Controller Interface Specification for Universal Serial Bus (Rev.
1.0, March 12, 2002) defines additional fields which were missing in
U-Boot's struct qTD; as these are also present in recent versions of
struct ehci_qtd in the Linux kernel, we add them here, too.
This fixes some nasty memory corruption problems.
Reported-by: Dan Lykowski lyko...@gmail.com
See http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/76942
Signed-off-by: Wolfgang Denk w...@denx.de
Cc: Remy Bohmer li...@bohmer.net
Cc: Dan Lykowski lyko...@gmail.com
Cc: Stefano Babic sba...@denx.de
Tested-by: Stefano Babic sba...@denx.de
---
Dear Remy,
this patch goes back to an old posting by Dan Lykowski.
Unfortunately Dan never submitted a patch, so this went unfixed until
now, when the bug bit Stefano...
Best regards,
Wolfgang
drivers/usb/host/ehci-hcd.c |1 +
drivers/usb/host/ehci.h | 14 +-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 37d056e..f44fc4e 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -288,6 +288,7 @@ static int ehci_td_buffer(struct qTD *td, void *buf, size_t
sz)
idx = 0;
while (idx 5) {
td-qt_buffer[idx] = cpu_to_hc32(addr);
+ td-qt_buffer_hi[idx] = 0;
next = (addr + 4096) ~4095;
delta = next - addr;
if (delta = sz)
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 6fae8ba..d3aa55b 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -166,12 +166,16 @@ struct usb_linux_config_descriptor {
/* Queue Element Transfer Descriptor (qTD). */
struct qTD {
- uint32_t qt_next;
+ /* this part defined by EHCI spec */
+ uint32_t qt_next; /* see EHCI 3.5.1 */
#defineQT_NEXT_TERMINATE 1
- uint32_t qt_altnext;
- uint32_t qt_token;
- uint32_t qt_buffer[5];
-};
+ uint32_t qt_altnext;/* see EHCI 3.5.2 */
+ uint32_t qt_token; /* see EHCI 3.5.3 */
+ uint32_t qt_buffer[5]; /* see EHCI 3.5.4 */
+ uint32_t qt_buffer_hi[5]; /* Appendix B */
+ /* pad struct for 32 byte alignment */
+ uint32_t unused[3];
+} __attribute__ ((aligned (32)));
/* Queue Head (QH). */
struct QH {
--
1.7.2.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] You have won 891, 934GBP from our office, Confirm with your full contact details
- Find the home of your dreams with eircom net property Sign up for email alerts now http://www.eircom.net/propertyalerts ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Fix potential empty DHCP Parameter Request List
Dear Gray Remlin, In message 4cbda586.6040...@rocketmail.com you wrote: Signed-off-by: Gray Remlin g_rem...@rocketmail.com --- net/bootp.c | 16 +++- 1 files changed, 15 insertions(+), 1 deletions(-) Why exactly are you reposting all your patches without any additional comments? Did you fail to read http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions ? Please explain the reasons for the repostings. 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: w...@denx.de Virtual means never knowing where your next byte is coming from. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [GIT PULL] Pull request: u-boot-atmel at91
Hello Wolfgang, The following changes since commit 1ba91ba23396005ef7b42381cc21f0baf78d0d60: Joakim Tjernlund (1): dlmalloc.c: Fix gcc alias warning are available in the git repository at: git://git.denx.de/u-boot-atmel.git at91 Andreas Bießmann (3): at91rm9200ek: convert to at91 at91rm9200: enable USB support at91rm9200ek: enbable USB support Reinhard Meyer (1): AT91 clock/timer: move static data to global_data struct MAINTAINERS |4 + arch/arm/cpu/arm926ejs/at91/clock.c | 55 +++--- arch/arm/cpu/arm926ejs/at91/timer.c | 85 +- arch/arm/include/asm/arch-at91/hardware.h |1 + arch/arm/include/asm/global_data.h| 14 ++ board/atmel/at91rm9200ek/Makefile |5 - board/atmel/at91rm9200ek/at91rm9200ek.c | 60 ++- board/atmel/at91rm9200ek/config.mk|3 +- board/atmel/at91rm9200ek/led.c| 58 +++--- board/atmel/at91rm9200ek/misc.c | 50 - board/atmel/at91rm9200ek/mux.c| 38 board/atmel/at91rm9200ek/partition.c | 38 boards.cfg|2 +- include/configs/at91rm9200ek.h| 286 + 14 files changed, 221 insertions(+), 478 deletions(-) delete mode 100644 board/atmel/at91rm9200ek/misc.c delete mode 100644 board/atmel/at91rm9200ek/mux.c delete mode 100644 board/atmel/at91rm9200ek/partition.c Best Regards, Reinhard ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] (no subject)
Hi Wolfgang, sorry for the delay, here is the patch sent using git send-email. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/6] board_init_r: Removed unused cmdtp variable
From: Richard Retanubun richardretanu...@ruggedcom.com
Follow up to commit 620f1f6a64095ed558e68d37f1965d015cd49b02
removed compiler warning for (now) unused cmd_tbl_t* cmdtp
---
arch/avr32/lib/board.c |1 -
arch/m68k/lib/board.c |1 -
arch/mips/lib/board.c |1 -
3 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c
index e6b81cc..96ccc7f 100644
--- a/arch/avr32/lib/board.c
+++ b/arch/avr32/lib/board.c
@@ -257,7 +257,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
extern char * env_name_spec;
#endif
char *s;
- cmd_tbl_t *cmdtp;
bd_t *bd;
gd = new_gd;
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index ae9478a..a8cb205 100644
--- a/arch/m68k/lib/board.c
+++ b/arch/m68k/lib/board.c
@@ -397,7 +397,6 @@ board_init_f (ulong bootflag)
*/
void board_init_r (gd_t *id, ulong dest_addr)
{
- cmd_tbl_t *cmdtp;
char *s;
bd_t *bd;
extern void malloc_bin_reloc (void);
diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c
index 0044b19..4a22f7b 100644
--- a/arch/mips/lib/board.c
+++ b/arch/mips/lib/board.c
@@ -276,7 +276,6 @@ void board_init_f(ulong bootflag)
void board_init_r (gd_t *id, ulong dest_addr)
{
- cmd_tbl_t *cmdtp;
#ifndef CONFIG_SYS_NO_FLASH
ulong size;
#endif
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [ELF_RELOC] Pull into u-boot-arm #master?
Dear Albert, do you see any reason to continue keeping elf_reloc as separate branch? I think it would be best to pull this into mainline now, or am I missing anything? 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: w...@denx.de Once they go up, who cares where they come down? That's not my department. - Werner von Braun ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [ELF_RELOC] Pull into u-boot-arm #master?
Dear Wolfgang Denk, Dear Albert, do you see any reason to continue keeping elf_reloc as separate branch? I think it would be best to pull this into mainline now, or am I missing anything? I personally would prefer that. No problems for ATMEL/AT91. Best Regards, Reinhard ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] u-boot crashes on ppc440gp
Hello, I am getting a bus fault error after the ME bit in the MSR register gets set, and the RFI instruction is executed. If the ME bit is 0, everything works fine, and u-boot runs without any problems. The bus fault error is at b __440_msr_continue instruction in the start.s file, which is the next instruction executed after the RFI instruction. Is it a memory alignment issue? Thank you, U-Boot 2010.09-rc2 (Oct 19 2010 - 07:03:13) CPU: AMCC PowerPC 440GP Rev. C at 300 MHz (PLB=100 OPB=50 EBC=50) Internal PCI arbiter enabled 32 kB I-Cache 32 kB D-Cache Board: Starter440 - BRE PPC440GP Evaluation Board I2C: ready DRAM: 256 MiB Top of RAM usable for U-Boot at: 1000 Reserving 323k for U-Boot at: 0ffaf000 Reserving 1024k for malloc() at: 0feaf000 Reserving 128 Bytes for Board Info at: 0feaef80 Reserving 56 Bytes for Global Data at: 0feaef48 Stack Pointer at: 0feaef28 New Stack Pointer is: 0feaef28 memstart: memsize: 1000 sramstart: c000 sramsize: 1fff bootflags: e700 intfreq: 11e1a301 busfreq: 05f5e100 baudrate: 0001c200 bi_s_version: 0feaefb8 bi_r_version: 0feaefbc bi_procfreq: 11e1a301 bi_plb_busfreq: 05f5e100 relocaddr: 0ffaf000 id: 0feaef48 Now running in RAM - U-Boot at: 0ffaf000 Bus Fault @ 0x0ffb1750, fixup 0x Machine Check Exception. Caused by (from msr): regs 0feaee18 NIP: 0FFB1750 XER: LR: 0FFB1750 REGS: 0feaee18 TRAP: 0200 DEAR: MSR: 00021000 EE: 0 PR: 0 FP: 0 ME: 1 IR/DR: 00 GPR00: 0FFB1198 0FEAEF08 0FEAEF48 0FFAF000 0FFB260C 0FFB1750 GPR08: 0600 20A4 0002 0002 0FFEE600 0FFEF000 GPR16: 0FEAEE08 0FEAEFB8 GPR24: 0FEAEFBC 0FEAEF48 0FEAEF28 0FFAF000 0FEAF000 0FEAF000 0FFEE6B4 0FEAEF80 Call backtrace: 0FFB2604 0FFB16B4 machine check ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] omap3evm: Wrap function under CONFIG_CMD_NET
The call to function setup_net_chip() is wrapped
inside #ifdef CONFIG_CMD_NET, but the implementation
wasn't.
Signed-off-by: Sanjeev Premi pr...@ti.com
---
board/ti/evm/evm.c |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index 6163b12..bb19a33 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -133,6 +133,7 @@ void set_muxconf_regs(void)
MUX_EVM();
}
+#if defined(CONFIG_CMD_NET)
/*
* Routine: setup_net_chip
* Description: Setting up the configuration GPMC registers specific to the
@@ -170,6 +171,7 @@ static void setup_net_chip(void)
udelay(1);
writel(GPIO0, gpio3_base-setdataout);
}
+#endif
int board_eth_init(bd_t *bis)
{
--
1.7.2.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] commit powerpc: Remove warm reset entry point does not work on mpc83xx
On Tue, 2010-10-19 at 12:07 +0200, Joakim Tjernlund wrote: My board has a problem with this change. I added it manually to my tree and now it wont boot at all(only with BDI2000 connected). Just to clarify, it won't boot with or without the BDI2000 connected, correct? It seems like my board uses the warm start vector at all times. Padding with 4 nop's after the _start symbol fixes the problem. It might be due to a somewhat peculiar reset design but I cannot understand why. Does this work for everyone else using 83xx? Odd... I don't have an 83xx board to test on unfortunately. Nothing jumps out as being obviously wrong in the assembly: = Pre-commit (works): fe000100 _start: fe000100: 3a a0 00 01 li r21,1 fe000104: 60 00 00 00 nop fe000108: 48 00 00 10 b fe000118 boot_cold fe00010c: 00 00 00 00 .long 0x0 fe000110 _start_warm: fe000110: 3a a0 00 02 li r21,2 fe000114: 48 00 00 0c b fe000120 boot_warm fe000118 boot_cold: fe000118: 3c 80 ff 40 lis r4,-192 fe00011c: 60 00 00 00 nop fe000120 boot_warm: fe000120: 7c a0 00 a6 mfmsr r5 fe000124: 48 00 00 05 bl fe000128 boot_warm+0x8 fe000128: 7c e8 02 a6 mflrr7 = Post-commit (doesn't work): fe000100 _start: fe000100: 3c 80 ff 40 lis r4,-192 fe000104: 60 00 00 00 nop fe000108: 7c a0 00 a6 mfmsr r5 fe00010c: 48 00 00 05 bl fe000110 _start+0x10 fe000110: 7c e8 02 a6 mflrr7 It'll be interesting to hear if the change affects other boards in the same way. Best, Peter ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/3 v2] nand: allow demand initialization
On Tue, 19 Oct 2010 01:40:58 -0400 Mike Frysinger vap...@gentoo.org wrote: On Monday, October 18, 2010 16:16:33 Scott Wood wrote: On Fri, 15 Oct 2010 15:04:47 -0400 Mike Frysinger wrote: On Friday, October 15, 2010 14:56:36 Scott Wood wrote: Applied to u-boot-nand-flash. awesome I've removed the patches for now, based on Wolfgang's comments my impression was that there is future work in the mtd layers to be done, but that this didnt preclude fixing the delayed nand init issue discovery of additional places in the code that need to call nand_init(). err, where ? all ive seen is the mtdparts stuff and you fixed that. http://lists.denx.de/pipermail/u-boot/2010-October/079438.html -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/1] omap3evm: Reduce overall boot-time
The default configuration of u-boot works great for developers. However, when u-boot is ready for the platform, much of these features are extra/redundant from product perspective. Without changing default behavior and function of u-boot, this patch consolidates the CONFIG options that most likely fall into the extra bucket under CONFIG_FAST_BOOT. With a view that boot device is usually fixed in the products, this patch allows selection of devices (and related features). Currently, selection is (exclusive) between MMC/SD and NAND under CONFIG_FAST_BOOT. If there is a need to support both, it can be added later. Though changes are done for OMAP3EVM, most of them should be applicable to other platforms as well. I have tried to group the CONFIG options logically. Here is the summary of reduction[1]: textdata bss dec hex filename Before: 227772 10900 257216 495888 79110 u-boot After: 1045934040 197952 306585 4ad99 u-boot [1] Calculation of before includes these patches: a) omap3evm: Wrap function under CONFIG_USB_OMAP3 b) omap3evm: Move function to identify board revision c) omap3evm: Wrap function under CONFIG_CMD_NET Sanjeev Premi (1): omap3evm: Support for fast boot include/configs/omap3_evm.h | 138 +++ 1 files changed, 138 insertions(+), 0 deletions(-) -- 1.7.2.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/1] omap3evm: Support for fast boot
Default configuration enables multiple features that are great for intial development work. But many of them are not useful when time taken to boot kernel is important - and uboot is frozen. This patch attempts to reduce the size of u-boot binary by excluding unused/not-so-commonly used features/commands. It allows initialization of unused devices to be skipped. Less time to load the binary and selective initialization results in considerable reduction in the boot time. Signed-off-by: Sanjeev Premi pr...@ti.com --- include/configs/omap3_evm.h | 138 +++ 1 files changed, 138 insertions(+), 0 deletions(-) diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index cd38698..9a07d93 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -373,4 +373,142 @@ extern unsigned int boot_flash_type; #define CONFIG_BOOTP_HOSTNAME 0x0004 #define CONFIG_BOOTP_BOOTPATH 0x0010 +/* + * Support for fast boot + * + * In default build, the feature is disabled. To use the feature: + * 1) Define CONFIG_FAST_BOOT + * 2) Select the device used as boot medium, by defining one of: + *- CONFIG_FAST_BOOT_MMC + *- CONFIG_FAST_BOOT_NAND + */ +#undef CONFIG_FAST_BOOT +#undef CONFIG_FAST_BOOT_MMC +#undef CONFIG_FAST_BOOT_NAND + +#ifdef CONFIG_FAST_BOOT + /* +* Generic config options +*/ + #ifndef CONFIG_SILENT_CONSOLE + #define CONFIG_SILENT_CONSOLE 1 + #endif + + #ifndef CONFIG_ENV_IS_NOWHERE + #define CONFIG_ENV_IS_NOWHERE 1 + #endif + + /* +* Exclude unused/rarely used features. +*/ + #undef CONFIG_SYS_LONGHELP + #undef CONFIG_SYS_HUSH_PARSER + + #undef CONFIG_REVISION_TAG + + #undef CONFIG_MD5 + #undef CONFIG_SHA1 + #undef CONFIG_BZIP2 + #undef CONFIG_LZMA + + #undef CONFIG_CMD_BDI + #undef CONFIG_CMD_BOOTD + #undef CONFIG_CMD_CONSOLE + #undef CONFIG_CMD_ECHO + #undef CONFIG_CMD_EDITENV + #undef CONFIG_CMD_FPGA + #undef CONFIG_CMD_IMI + #undef CONFIG_CMD_ITEST + #undef CONFIG_CMD_LOADB + #undef CONFIG_CMD_LOADS + #undef CONFIG_CMD_NET + #undef CONFIG_CMD_NFS + #undef CONFIG_CMD_SETGETDCR + #undef CONFIG_CMD_SOURCE + #undef CONFIG_CMD_XIMG + #undef CONFIG_CMD_FPGA + #undef CONFIG_CMD_IMLS + #undef CONFIG_CMD_FLASH + #undef CONFIG_CMD_EXT2 + #undef CONFIG_CMD_USB + + #undef CONFIG_NET_MULTI + + #undef CONFIG_SMC911X + + #undef CONFIG_OF_LIBFDT + #undef CONFIG_FIT + + #undef CONFIG_EXTRA_ENV_SETTINGS + #define CONFIG_EXTRA_ENV_SETTINGS \ + verify=no\0 \ + bootfile=uImage\0 + + #undef CONFIG_BOOTDELAY + #define CONFIG_BOOTDELAY0 + + /* +* Select options based on choice of boot medium. +*/ + #ifdef CONFIG_FAST_BOOT_MMC + #undef CONFIG_NAND_OMAP_GPMC + #undef CONFIG_ENV_IS_IN_NAND + #undef CONFIG_CMD_NAND + #endif + + #ifdef CONFIG_FAST_BOOT_MMC + #undef CONFIG_ENV_IS_IN_NAND + #undef CONFIG_CMD_NAND + + #undef CONFIG_BOOTCOMMAND + #define CONFIG_BOOTCOMMAND \ + mmc init; \ + fatload mmc 0 0x8000 uImage; \ + bootm 0x8000; + + #undef CONFIG_BOOTARGS + #define CONFIG_BOOTARGS \ + console=ttyS0,115200n8\ + mem=128M quiet noinitrd \ + root=/dev/mmcblk0p2 rw\ + rootfstype=ext3 rootwait + #endif + + #ifdef CONFIG_FAST_BOOT_NAND + # undef CONFIG_OMAP3_MMC + # undef CONFIG_CMD_MMC + # undef CONFIG_DOS_PARTITION + # undef CONFIG_CMD_FAT + + #undef CONFIG_BOOTCOMMAND + #define CONFIG_BOOTCOMMAND \ + nand read.i 0x8000 28 50; \ + bootm 0x8000; + + #undef CONFIG_BOOTARGS + #define CONFIG_BOOTARGS \ + console=ttyS0,115200n8\ + mem=128M quiet noinitrd \ + root=/dev/mtdblock4 rw\ + rootfstype=jffs2 + #endif + + /* +* Board specific features +* Exclude not-so-common features +*/ + #undef CONFIG_USB_OMAP3 + #undef CONFIG_MUSB_HCD + + #undef CONFIG_USB_STORAGE + #undef CONFIG_USB_KEYBOARD + #undef CONFIG_SYS_USB_EVENT_POLL + #undef CONFIG_PREBOOT + + #undef CONFIG_MUSB_UDC + #undef
[U-Boot] ICACHE in core initialization to improve u-boot boot time: Breaks booting with i2c code while executing in flash.
Hi Kim,
I recently rebased our platform from uboot 2009.11 to 2010.09 and tried out the
ICACHE improvements you made
in commit 1a2e203b31d33fb720f2cf1033b241ad36ab405a
It does not work on our platform (similar to MPC8360EMDS). I think this is
specific to our platform because
we need to initialize i2c and use i2c while still executing from flash in
checkboard()) to read and parse a board-id i2c-eeprom
to support a unified uboot binary for multiple board flavors.
I pasted checkboard code below; none of the underlying code uses malloc, just
static buffer allocations.
Just an FYI mostly, I am okay with not having ICACHE for our board while in
uboot.
Just curious if you know of a reason from the limited explanation I've provided.
Also, as a general rule, does uboot accept hosting custom non-eval-platform
boards?
I'm tempted to mainline our code (mostly contained under
/board/$company_name/...)
Thanks for your time
- Richard
/* --- gd-board_type is identified here */
int checkboard(void)
{
int rc = -EINVAL;
int i = -1;
int nbytes = 0;
char pnbuf[512] = {0};
rc = -EINVAL; /* Initialize return code */
/*
* Based on code from cm5200, called while u-boot is executing in flash,
* thus things like malloc are not allowed.
*/
/*
* We need I2C to access HW ID data from EEPROM, so we call i2c_init()
* here despite the fact that it will be called again later on. We
* also use a little trick to silence I2C-related output.
*/
gd-flags |= GD_FLG_SILENT;
i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
gd-flags = ~GD_FLG_SILENT;
/* Reset i2c controller(s) to clear any stuck-bus conditions */
i2c_bus_reset(CONFIG_SYS_IMMR + CONFIG_SYS_I2C_OFFSET);
#if defined(CONFIG_SYS_I2C2_OFFSET)
i2c_bus_reset(CONFIG_SYS_IMMR + CONFIG_SYS_I2C2_OFFSET);
#endif /* CONFIG_SYS_I2C2_OFFSET */
/* Print a message to stay off the i2c bus for devices to settle */
puts(I2C: Reset\n);
rc = rc_id_board_from_esig(); /* fills in gd-board_type */
if (rc == 0) {
printf(BOARD: %s [%08lX]\n,
rc_get_string_from_board_type(gd-board_type),
gd-board_type);
} else {
/* BAD PARTNUMBER OR BAD I2C ACCESS, REBOOT */
printf(BOARD: FAILED IDENTIFICATION, error %d\n, rc);
}
/* Always return 0, otherwise u-boot will halt and ask for reset */
return 0;
}
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [ELF_RELOC] Pull into u-boot-arm #master?
On Tue, Oct 19, 2010 at 10:42 AM, Reinhard Meyer u-b...@emk-elektronik.de wrote: Dear Wolfgang Denk, Dear Albert, do you see any reason to continue keeping elf_reloc as separate branch? I think it would be best to pull this into mainline now, or am I missing anything? I personally would prefer that. No problems for ATMEL/AT91. +1 After a rebase of u-boot-arm/elf_reloc onto u-boot/master, da850evm plus NAND appears to be working fine. Best Regards, Ben Gardiner --- Nanometrics Inc. http://www.nanometrics.ca ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] omap3evm: Move function to identify board revision
-Original Message- From: Premi, Sanjeev Sent: Tuesday, October 19, 2010 6:37 PM To: u-boot@lists.denx.de Cc: Premi, Sanjeev Subject: [PATCH] omap3evm: Move function to identify board revision Function omap3_evm_get_revision() - to identify the board revision was called at end of setup_net_chip(). Board revision can be ascertained only by identifying the Ethernet chipset - but combining setup operations with revision detection isn;t a good idea. Moved the function and added detailed comment to set the context. Signed-off-by: Sanjeev Premi pr...@ti.com --- board/ti/evm/evm.c |9 ++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index 73330db..6163b12 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -109,6 +109,12 @@ int misc_init_r(void) #if defined(CONFIG_CMD_NET) setup_net_chip(); + + /* + * Board revision can be ascertained only by identifying + * the Ethernet chipset. + */ + omap3_evm_get_revision(); #endif [sp] While reviewing the code, I realized a latent bug that can hit us when CONFIG_CMD_NET is not defined. omap3_evm_get_revision() never gets called - value of omap3_evm_version is never set. So, value returned by get_omap3_evm_rev() depends upon compiler used. Please disregard this patch. I will submit a cleaned-up patch with takes care of this latent bug as well. ~sanjeev dieid_num_r(); @@ -163,9 +169,6 @@ static void setup_net_chip(void) writel(GPIO0, gpio3_base-cleardataout); udelay(1); writel(GPIO0, gpio3_base-setdataout); - - /* determine omap3evm revision */ - omap3_evm_get_revision(); } int board_eth_init(bd_t *bis) -- 1.7.2.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/1] omap3evm: Support for fast boot
-Original Message- From: Loïc Minier [mailto:l...@dooz.org] Sent: Tuesday, October 19, 2010 10:14 PM To: Premi, Sanjeev Cc: u-boot@lists.denx.de Subject: Re: [U-Boot] [PATCH 1/1] omap3evm: Support for fast boot On Tue, Oct 19, 2010, Sanjeev Premi wrote: +#undef CONFIG_FAST_BOOT I wonder whether CONFIG_FAST_BOOT would cause confusion if u-boot gains support for Android fastboot someday? http://en.wikipedia.org/wiki/Fastboot http://android-dls.com/wiki/index.php?title=Fastboot [sp] The intent here is to boot faster - hence the name. Wasn't aware of any Android overlap. How about any of these: - CONFIG_SMALL_SIZE - CONFIG_FASTER_BOOT :) ^^ Any other suggestions? ~sanjeev -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/1] omap3evm: Support for fast boot
On Tue, Oct 19, 2010, Sanjeev Premi wrote: +#undef CONFIG_FAST_BOOT I wonder whether CONFIG_FAST_BOOT would cause confusion if u-boot gains support for Android fastboot someday? http://en.wikipedia.org/wiki/Fastboot http://android-dls.com/wiki/index.php?title=Fastboot -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] commit powerpc: Remove warm reset entry point does not work on mpc83xx
Peter Tyser pty...@xes-inc.com wrote on 2010/10/19 17:51:11: On Tue, 2010-10-19 at 12:07 +0200, Joakim Tjernlund wrote: My board has a problem with this change. I added it manually to my tree and now it wont boot at all(only with BDI2000 connected). Just to clarify, it won't boot with or without the BDI2000 connected, correct? It will only boot WITH the BDI2000. That is because my BDI sets the PC before execute. It seems like my board uses the warm start vector at all times. Padding with 4 nop's after the _start symbol fixes the problem. It might be due to a somewhat peculiar reset design but I cannot understand why. Does this work for everyone else using 83xx? Odd... I don't have an 83xx board to test on unfortunately. Nothing jumps out as being obviously wrong in the assembly: The difference is that I suspect execution starts at 0xXX110 rather than 0xXX100. BTW, I have my reset vector at 0x0 What causes a warm reset? Jocke ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Makefile: rename TEXT_BASE to CONFIG_SYS_TEXT_BASE
--- Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 30a564d..a3136da 100644 --- a/Makefile +++ b/Makefile @@ -341,7 +341,7 @@ $(obj)u-boot.imx: $(obj)u-boot.bin $(obj)u-boot.kwb: $(obj)u-boot.bin $(obj)tools/mkimage -n $(KWD_CONFIG) -T kwbimage \ - -a $(CONFIG_SYS_TEXT_BASE) -e $(TEXT_BASE) -d $ $@ + -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $ $@ $(obj)u-boot.sha1: $(obj)u-boot.bin $(obj)tools/ubsha1 $(obj)u-boot.bin -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [Patch V2] update board EB+CPUx9K2
* update to support arm reloaction
* unnecessary environment variables removed
Signed-off-by: Jens Scharsig js_at...@scharsoft.de
---
changes since V1
* make conform with Rename TEXT_BASE into CONFIG_SYS_TEXT_BASE patch
board/BuS/eb_cpux9k2/config.mk |1 -
board/BuS/eb_cpux9k2/cpux9k2.c |7 +++
include/configs/eb_cpux9k2.h | 23 ---
3 files changed, 11 insertions(+), 20 deletions(-)
delete mode 100644 board/BuS/eb_cpux9k2/config.mk
diff --git a/board/BuS/eb_cpux9k2/config.mk b/board/BuS/eb_cpux9k2/config.mk
deleted file mode 100644
index e554a45..000
--- a/board/BuS/eb_cpux9k2/config.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SYS_TEXT_BASE = 0x23f0
diff --git a/board/BuS/eb_cpux9k2/cpux9k2.c b/board/BuS/eb_cpux9k2/cpux9k2.c
index bbceaf3..fe62a0f 100644
--- a/board/BuS/eb_cpux9k2/cpux9k2.c
+++ b/board/BuS/eb_cpux9k2/cpux9k2.c
@@ -66,7 +66,7 @@ int board_init(void)
gd-bd-bi_arch_number = MACH_TYPE_EB_CPUX9K2;
/* adress of boot parameters */
- gd-bd-bi_boot_params = PHYS_SDRAM + 0x100;
+ gd-bd-bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
#ifdef CONFIG_STATUS_LED
status_led_set(STATUS_LED_BOOT, STATUS_LED_ON);
@@ -134,9 +134,8 @@ void reset_phy(void)
int dram_init(void)
{
- gd-bd-bi_dram[0].start = PHYS_SDRAM;
- gd-bd-bi_dram[0].size =
- get_ram_size((volatile long *) PHYS_SDRAM, PHYS_SDRAM_SIZE);
+ gd-ram_size = get_ram_size((volatile long *)CONFIG_SYS_SDRAM_BASE,
+ CONFIG_SYS_SDRAM_SIZE);
return 0;
}
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index 4ff4a85..8d8af93 100644
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -42,7 +42,7 @@
#define CONFIG_MISC_INIT_R
/*--*/
-
+#define CONFIG_SYS_TEXT_BASE 0x
#define CONFIG_SYS_LOAD_ADDR 0x2100 /* default load address */
#define CONFIG_SYS_BOOT_SIZE 0x00 /* 0 KBytes */
@@ -98,12 +98,14 @@
*/
#define CONFIG_NR_DRAM_BANKS 1
-#define PHYS_SDRAM 0x2000
-#define PHYS_SDRAM_SIZE0x0400 /* 64 megs */
-#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM
+#define CONFIG_SYS_SDRAM_BASE 0x2000
+#define CONFIG_SYS_SDRAM_SIZE 0x0400 /* 64 megs */
+#define CONFIG_SYS_INIT_SP_ADDR0x00204000 /* use internal
SRAM */
+
+#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
- PHYS_SDRAM_SIZE - 0x0040 - \
+ CONFIG_SYS_SDRAM_SIZE - 0x0040 - \
CONFIG_SYS_MALLOC_LEN)
#define CONFIG_SYS_PIOC_ASR_VAL0x /* PIOC as D16/D31 */
@@ -249,6 +251,7 @@
/* FLASH organization */
/* NOR-FLASH */
+#define CONFIG_FLASH_SHOW_PROGRESS 45
#define CONFIG_FLASH_CFI_DRIVER1
@@ -396,16 +399,6 @@
nandboot=run bootargsdefaults;\
set bootargs $(bootargs) root=initramfs boot=nand \
;bootm $(kerneladdr)\0\
- uu=run update_uboot\0 \
- ur=run update_root;run nk\0 \
- nk=run bootargsdefaults;set bootargs $(bootargs) root=initramfs \
- boot=local\
- ;echo $(bootargs) \
- ;dhcp uImage_cpux9k2;bootm\0 \
- nn=run bootargsdefaults;set bootargs $(bootargs) root=initramfs \
- boot=nand \
- ;echo $(bootargs) \
- ;dhcp uImage_cpux9k2;bootm\0 \
/*--*/
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/5] sh: Fix warning about uninitialized value of ramdisk_flags
Signed-off-by: Nobuhiro Iwamatsu iwama...@nigauri.org
---
arch/sh/lib/bootm.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c
index 019e8ec..f38d0b0 100644
--- a/arch/sh/lib/bootm.c
+++ b/arch/sh/lib/bootm.c
@@ -103,7 +103,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
bootm_headers_t *ima
sh_check_cmd_arg(bootargs, CMD_ARG_RD_DOLOAD, 10);
/* Initrd */
if (images-rd_start || images-rd_end) {
- unsigned long ramdisk_flags;
+ unsigned long ramdisk_flags = 0;
int val = sh_check_cmd_arg(bootargs, CMD_ARG_RD_PROMPT, 10);
if (val == 1)
ramdisk_flags |= RD_PROMPT;
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/5] sh: sh7785lcr: Add CONFIG_SYS_TEXT_BASE for 32bit mode
Signed-off-by: Nobuhiro Iwamatsu iwama...@nigauri.org --- board/renesas/sh7785lcr/config.mk |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/board/renesas/sh7785lcr/config.mk b/board/renesas/sh7785lcr/config.mk index 1a9038c..6853d2b 100644 --- a/board/renesas/sh7785lcr/config.mk +++ b/board/renesas/sh7785lcr/config.mk @@ -24,6 +24,8 @@ # sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifndef CONFIG_SYS_TEXT_BASE +ifdef CONFIG_SH_32BIT +CONFIG_SYS_TEXT_BASE = 0x8FF8 +else CONFIG_SYS_TEXT_BASE = 0x0ff8 endif -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 4/5] sh: sh3: Move to boards.cfg
Move the sh3 target boards out of the Makefile and into boards.cfg. And fix sh3 of MAKEALL. Signed-off-by: Nobuhiro Iwamatsu iwama...@nigauri.org --- MAKEALL|6 +- Makefile | 14 -- boards.cfg |2 ++ 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/MAKEALL b/MAKEALL index 9066a40..155131a 100755 --- a/MAKEALL +++ b/MAKEALL @@ -615,11 +615,7 @@ LIST_blackfin=$(boards_by_arch blackfin) # LIST_sh2=$(boards_by_cpu sh2) - -LIST_sh3= \ - mpr2\ - ms7720se\ - +LIST_sh3=$(boards_by_cpu sh3) LIST_sh4= \ ms7750se\ diff --git a/Makefile b/Makefile index 868fdb7..481add9 100644 --- a/Makefile +++ b/Makefile @@ -1189,20 +1189,6 @@ bf527-ezkit-v2_config: unconfig # # -## sh3 (Renesas SuperH) -# - -mpr2_config: unconfig - @mkdir -p $(obj)include - @echo #define CONFIG_MPR2 1 $(obj)include/config.h - @$(MKCONFIG) -a $@ sh sh3 mpr2 - -ms7720se_config: unconfig - @mkdir -p $(obj)include - @echo #define CONFIG_MS7720SE 1 $(obj)include/config.h - @$(MKCONFIG) -a $@ sh sh3 ms7720se - -# ## sh4 (Renesas SuperH) # diff --git a/boards.cfg b/boards.cfg index 06e9d5d..f8f9579 100644 --- a/boards.cfg +++ b/boards.cfg @@ -719,5 +719,7 @@ davinci_schmoogie arm arm926ejs schmoogie davinci davinci davinci_dm355leopard arm arm926ejs dm355leoparddavinci davinci bf527-ad7160-eval blackfin blackfin rsk7203sh sh2 rsk7203 renesas - +mpr2 sh sh3 mpr2- - +ms7720se sh sh3 ms7720se- - # Target ARCHCPU Board name Vendor SoC Options ### -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 5/5] sh: sh4: Move to boards.cfg
Move the sh4 target boards out of the Makefile and into boards.cfg.
And fix sh4 of MAKEALL.
Signed-off-by: Nobuhiro Iwamatsu iwama...@nigauri.org
---
MAKEALL| 19 ++-
Makefile | 60
boards.cfg | 10 ++
3 files changed, 12 insertions(+), 77 deletions(-)
diff --git a/MAKEALL b/MAKEALL
index 155131a..43c0cdd 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -616,24 +616,9 @@ LIST_blackfin=$(boards_by_arch blackfin)
LIST_sh2=$(boards_by_cpu sh2)
LIST_sh3=$(boards_by_cpu sh3)
+LIST_sh4=$(boards_by_cpu sh4)
-LIST_sh4= \
- ms7750se\
- ms7722se\
- MigoR \
- r7780mp \
- r2dplus \
- sh7763rdp \
- sh7785lcr \
- ap325rxa\
- espt\
-
-
-LIST_sh= \
- ${LIST_sh2} \
- ${LIST_sh3} \
- ${LIST_sh4} \
-
+LIST_sh=$(boards_by_arch sh)
#
## SPARC Systems
diff --git a/Makefile b/Makefile
index 481add9..b4be8bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1184,66 +1184,6 @@ bf527-ezkit-v2_config: unconfig
@$(MKCONFIG) -t BF527_EZKIT_REV_2_1 \
bf527-ezkit blackfin blackfin bf527-ezkit
-#
-# SH3 (SuperH)
-#
-
-#
-## sh4 (Renesas SuperH)
-#
-
-MigoR_config : unconfig
- @mkdir -p $(obj)include
- @echo #define CONFIG_MIGO_R 1 $(obj)include/config.h
- @$(MKCONFIG) -a $@ sh sh4 MigoR renesas
-
-ms7750se_config: unconfig
- @mkdir -p $(obj)include
- @echo #define CONFIG_MS7750SE 1 $(obj)include/config.h
- @$(MKCONFIG) -a $@ sh sh4 ms7750se
-
-ms7722se_config : unconfig
- @mkdir -p $(obj)include
- @echo #define CONFIG_MS7722SE 1 $(obj)include/config.h
- @$(MKCONFIG) -a $@ sh sh4 ms7722se
-
-r2dplus_config : unconfig
- @mkdir -p $(obj)include
- @echo #define CONFIG_R2DPLUS 1 $(obj)include/config.h
- @$(MKCONFIG) -a $@ sh sh4 r2dplus renesas
-
-r7780mp_config: unconfig
- @mkdir -p $(obj)include
- @echo #define CONFIG_R7780MP 1 $(obj)include/config.h
- @$(MKCONFIG) -a $@ sh sh4 r7780mp renesas
-
-sh7763rdp_config : unconfig
- @mkdir -p $(obj)include
- @echo #define CONFIG_SH7763RDP 1 $(obj)include/config.h
- @$(MKCONFIG) -a $@ sh sh4 sh7763rdp renesas
-
-sh7785lcr_32bit_config \
-sh7785lcr_config : unconfig
- @mkdir -p $(obj)include
- @mkdir -p $(obj)board/renesas/sh7785lcr
- @echo #define CONFIG_SH7785LCR 1 $(obj)include/config.h
- @if [ $(findstring 32bit, $@) ] ; then \
- echo #define CONFIG_SH_32BIT 1 $(obj)include/config.h ; \
- echo CONFIG_SYS_TEXT_BASE = 0x8ff8 \
- $(obj)board/renesas/sh7785lcr/config.tmp ; \
- fi
- @$(MKCONFIG) -n $@ -a sh7785lcr sh sh4 sh7785lcr renesas
-
-ap325rxa_config : unconfig
- @mkdir -p $(obj)include
- @echo #define CONFIG_AP325RXA 1 $(obj)include/config.h
- @$(MKCONFIG) -a $@ sh sh4 ap325rxa renesas
-
-espt_config : unconfig
- @mkdir -p $(obj)include
- @echo #define CONFIG_ESPT 1 $(obj)include/config.h
- @$(MKCONFIG) -a $@ sh sh4 espt
-
#
#
diff --git a/boards.cfg b/boards.cfg
index f8f9579..bf4ff28 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -721,5 +721,15 @@ bf527-ad7160-eval blackfin blackfin
rsk7203sh sh2 rsk7203 renesas -
mpr2 sh sh3 mpr2- -
ms7720se sh sh3 ms7720se- -
+MigoRshsh4 MigoR renesas -
+ms7750se sh sh4 ms7750se- -
+ms7722se sh sh4 ms7722se- -
+r2dplussh sh4 r2dplus renesas -
+r7780mpsh sh4 r7780mp renesas -
+sh7763rdp sh sh4 sh7763rdp renesas -
+sh7785lcr sh sh4 sh7785lcr renesas -
+sh7785lcr_32bitsh sh4 sh7785lcr renesas -
sh7785lcr:SH_32BIT=1
+ap325rxa sh sh4 ap325rxarenesas -
+espt sh sh4 espt- -
# Target ARCHCPU Board name Vendor SoC
Options
###
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
[U-Boot] [PATCH 3/5] sh: rsk7203: Move to boards.cfg
Move the rsk7203 target out of the Makefile and into boards.cfg. And fix sh2 of MAKEALL. Signed-off-by: Nobuhiro Iwamatsu iwama...@nigauri.org --- MAKEALL|5 ++--- Makefile |8 boards.cfg |1 + 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/MAKEALL b/MAKEALL index c1f3842..9066a40 100755 --- a/MAKEALL +++ b/MAKEALL @@ -614,9 +614,8 @@ LIST_blackfin=$(boards_by_arch blackfin) ## SH Systems # -LIST_sh2= \ - rsk7203 \ - +LIST_sh2=$(boards_by_cpu sh2) + LIST_sh3= \ mpr2\ ms7720se\ diff --git a/Makefile b/Makefile index 30a564d..868fdb7 100644 --- a/Makefile +++ b/Makefile @@ -1189,14 +1189,6 @@ bf527-ezkit-v2_config: unconfig # # -## sh2 (Renesas SuperH) -# -rsk7203_config: unconfig - @mkdir -p $(obj)include - @echo #define CONFIG_RSK7203 1 $(obj)include/config.h - @$(MKCONFIG) -a $@ sh sh2 rsk7203 renesas - -# ## sh3 (Renesas SuperH) # diff --git a/boards.cfg b/boards.cfg index 3a965e9..06e9d5d 100644 --- a/boards.cfg +++ b/boards.cfg @@ -718,5 +718,6 @@ davinci_dm6467evm arm arm926ejs dm6467evm davinci davinci davinci_schmoogie arm arm926ejs schmoogie davinci davinci davinci_dm355leopard arm arm926ejs dm355leoparddavinci davinci bf527-ad7160-eval blackfin blackfin +rsk7203sh sh2 rsk7203 renesas - # Target ARCHCPU Board name Vendor SoC Options ### -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Makefile: rename TEXT_BASE to CONFIG_SYS_TEXT_BASE
Please ignore, the same patch was submitted earlier today by Gray Remlin. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/6] Rename TEXT_BASE to CONFIG_SYS_TEXT_BASE
Signed-off-by: Nobuhiro Iwamatsu iwama...@nigauri.org --- arch/sh/config.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/sh/config.mk b/arch/sh/config.mk index 07ba68f..415c949 100644 --- a/arch/sh/config.mk +++ b/arch/sh/config.mk @@ -29,6 +29,6 @@ STANDALONE_LOAD_ADDR += -EB endif PLATFORM_CPPFLAGS += -DCONFIG_SH -D__SH__ -PLATFORM_LDFLAGS += -e $(CONFIG_SYS_TEXT_BASE) --defsym reloc_dst=$(TEXT_BASE) +PLATFORM_LDFLAGS += -e $(CONFIG_SYS_TEXT_BASE) --defsym reloc_dst=$(CONFIG_SYS_TEXT_BASE) LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2] MX31: Removed warnings for iomux function
Removed warnings generated in the mx31_set_pad() function.
Signed-off-by: Stefano Babic sba...@denx.de
---
arch/arm/cpu/arm1136/mx31/generic.c |7 +++
arch/arm/include/asm/arch-mx31/mx31.h |1 +
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c
b/arch/arm/cpu/arm1136/mx31/generic.c
index cbe8243..8bd23ee 100644
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -93,17 +93,16 @@ void mx31_gpio_mux(unsigned long mode)
void mx31_set_pad(enum iomux_pins pin, u32 config)
{
- u32 field, l;
- void *reg;
+ u32 field, l, reg;
pin = IOMUX_PADNUM_MASK;
reg = (IOMUXC_BASE + 0x154) + (pin + 2) / 3 * 4;
field = (pin + 2) % 3;
- l = __raw_readl(reg);
+ l = __REG(reg);
l = ~(0x1ff (field * 10));
l |= config (field * 10);
- __raw_writel(l, reg);
+ __REG(reg) = l;
}
diff --git a/arch/arm/include/asm/arch-mx31/mx31.h
b/arch/arm/include/asm/arch-mx31/mx31.h
index 5a5aa11..a755212 100644
--- a/arch/arm/include/asm/arch-mx31/mx31.h
+++ b/arch/arm/include/asm/arch-mx31/mx31.h
@@ -27,6 +27,7 @@
extern u32 mx31_get_ipg_clk(void);
#define imx_get_uartclk mx31_get_ipg_clk
extern void mx31_gpio_mux(unsigned long mode);
+extern void mx31_set_pad(enum iomux_pins pin, u32 config);
void mx31_uart1_hw_init(void);
void mx31_spi2_hw_init(void);
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] commit powerpc: Remove warm reset entry point does not work on mpc83xx
It seems like my board uses the warm start vector at all times. Padding with 4 nop's after the _start symbol fixes the problem. It might be due to a somewhat peculiar reset design but I cannot understand why. Does this work for everyone else using 83xx? Odd... I don't have an 83xx board to test on unfortunately. Nothing jumps out as being obviously wrong in the assembly: The difference is that I suspect execution starts at 0xXX110 rather than 0xXX100. BTW, I have my reset vector at 0x0 What causes a warm reset? My understanding is that a warm reset on the 8xxx CPUs isn't really a hardware reset - its just when code explicitly jumps to the warm reset entry point. For example, this board used to jump to _start_warm when reset was ran in U-Boot: http://git.denx.de/?p=u-boot.git;a=commitdiff;h=3792d7436e2bf881b6abdede5a481a62b5dedd55 During normal use I thought that the reset entry point was always 0xX100 and a warm reset would never occur. What is the power on reset process like on your board? Best, Peter ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [GIT PULL] Pull request: u-boot-atmel at91
Hello, I just noticed that: board/atmel/at91rm9200ek/config.mk|3 +- This file should/could be removed by moving the text base define to the board config file. Simplest way is that you send an incremental patch and I squash it in before Wolfgang pulls. Or, if its OK for Wolfgang to fix this later, stuff can be pulled now anyway. Best Regards, Reinhard ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [GIT PULL] Pull request: u-boot-atmel at91
Dear Reinhard Meyer, In message 4cbde68e.2000...@emk-elektronik.de you wrote: This file should/could be removed by moving the text base define to the board config file. Simplest way is that you send an incremental patch and I squash it in before Wolfgang pulls. Or, if its OK for Wolfgang to fix this later, stuff can be pulled now anyway. Feel free to try to fix it before I pull - but you don't have much time, as I'm starting my night shift now :-) 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: w...@denx.de This message was made from 100% recycled electrons. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Update TEXT_BASE to CONFIG_SYS_TEXT_BASE
This was missed out in a couple of files under nand_spl
Signed-off-by: Sughosh Ganu urwithsugh...@gmail.com
---
nand_spl/nand_boot.c |3 ++-
nand_spl/nand_boot_fsl_nfc.c |3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c
index 4d6db14..a137625 100644
--- a/nand_spl/nand_boot.c
+++ b/nand_spl/nand_boot.c
@@ -224,7 +224,8 @@ static int nand_load(struct mtd_info *mtd, unsigned int
offs,
#if defined(CONFIG_ARM) !defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
void board_init_f (ulong bootflag)
{
- relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL,
TEXT_BASE);
+ relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL,
+ CONFIG_SYS_TEXT_BASE);
}
#endif
diff --git a/nand_spl/nand_boot_fsl_nfc.c b/nand_spl/nand_boot_fsl_nfc.c
index 959f162..833cf47 100644
--- a/nand_spl/nand_boot_fsl_nfc.c
+++ b/nand_spl/nand_boot_fsl_nfc.c
@@ -266,7 +266,8 @@ static int nand_load(unsigned int from, unsigned int size,
unsigned char *buf)
#if defined(CONFIG_ARM) !defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
void board_init_f (ulong bootflag)
{
- relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL,
TEXT_BASE);
+ relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL,
+ CONFIG_SYS_TEXT_BASE);
}
#endif
--
1.7.0.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [GIT PULL] Pull request: u-boot-imx
Dear Stefano Babic,
In message 4cbda6a2.5010...@denx.de you wrote:
Hi Wolfgang,
please pull from u-boot-imx.
The following changes since commit cacc342d5aa311673efdc05770cb53246dd41c9f:
Merge branch 'master' of git://git.denx.de/u-boot-arm (2010-10-17
20:25:05 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-imx master
Jason Liu (2):
MX5: rename mx51 to mx5
MX5: Remove dead code with ENABLE_IMPRECISE_ABORT
Magnus Lilja (1):
i.MX31: Fix Litekit board to use new ARM relocation support.
Stefano Babic (1):
MX31: add delay between USB port setup and reset
Wolfgang Denk (1):
QONG: fix and update board config file
arch/arm/cpu/armv7/{mx51 = mx5}/Makefile |0
arch/arm/cpu/armv7/{mx51 = mx5}/clock.c | 42
++--
arch/arm/cpu/armv7/{mx51 = mx5}/iomux.c |2 +-
arch/arm/cpu/armv7/{mx51 = mx5}/lowlevel_init.S | 14 ---
arch/arm/cpu/armv7/{mx51 = mx5}/soc.c | 28 -
arch/arm/cpu/armv7/{mx51 = mx5}/speed.c |0
arch/arm/cpu/armv7/{mx51 = mx5}/timer.c |8 ++--
arch/arm/cpu/armv7/{mx51 = mx5}/u-boot.lds|0
.../asm/{arch-mx51 = arch-mx5}/asm-offsets.h |0
.../include/asm/{arch-mx51 = arch-mx5}/clock.h|0
.../include/asm/{arch-mx51 = arch-mx5}/crm_regs.h |0
.../include/asm/{arch-mx51 = arch-mx5}/imx-regs.h |0
.../include/asm/{arch-mx51 = arch-mx5}/iomux.h|8 ++--
.../mx51_pins.h = arch-mx5/mx5x_pins.h} |6 +-
.../asm/{arch-mx51 = arch-mx5}/sys_proto.h|0
board/freescale/mx51evk/mx51evk.c |2 +-
board/logicpd/imx31_litekit/config.mk |2 +-
board/logicpd/imx31_litekit/imx31_litekit.c| 10 -
board/ttcontrol/vision2/vision2.c |2 +-
boards.cfg |4 +-
drivers/usb/host/ehci-mxc.c|2 +
include/configs/imx31_litekit.h|7 +++
include/configs/mx51evk.h |4 +-
include/configs/qong.h | 32 +++
include/configs/vision2.h |4 +-
25 files changed, 90 insertions(+), 87 deletions(-)
rename arch/arm/cpu/armv7/{mx51 = mx5}/Makefile (100%)
rename arch/arm/cpu/armv7/{mx51 = mx5}/clock.c (85%)
rename arch/arm/cpu/armv7/{mx51 = mx5}/iomux.c (99%)
rename arch/arm/cpu/armv7/{mx51 = mx5}/lowlevel_init.S (95%)
rename arch/arm/cpu/armv7/{mx51 = mx5}/soc.c (81%)
rename arch/arm/cpu/armv7/{mx51 = mx5}/speed.c (100%)
rename arch/arm/cpu/armv7/{mx51 = mx5}/timer.c (92%)
rename arch/arm/cpu/armv7/{mx51 = mx5}/u-boot.lds (100%)
rename arch/arm/include/asm/{arch-mx51 = arch-mx5}/asm-offsets.h (100%)
rename arch/arm/include/asm/{arch-mx51 = arch-mx5}/clock.h (100%)
rename arch/arm/include/asm/{arch-mx51 = arch-mx5}/crm_regs.h (100%)
rename arch/arm/include/asm/{arch-mx51 = arch-mx5}/imx-regs.h (100%)
rename arch/arm/include/asm/{arch-mx51 = arch-mx5}/iomux.h (98%)
rename arch/arm/include/asm/{arch-mx51/mx51_pins.h =
arch-mx5/mx5x_pins.h} (99%)
rename arch/arm/include/asm/{arch-mx51 = arch-mx5}/sys_proto.h (100%)
Applied, thanks.
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: w...@denx.de
It is practically impossible to teach good programming style to stu-
dents that have had prior exposure to BASIC: as potential programmers
they are mentally mutilated beyond hope of regeneration. - Dijkstra
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Support for sending DHCP client options
On Tue, Oct 19, 2010 at 02:42:16PM +0100, Gray Remlin wrote: Signed-off-by: Gray Remlin g_rem...@rocketmail.com --- README |7 ++ common/cmd_nvedit.c |3 ++ net/bootp.c | 52 +++ tools/env/fw_env.c |4 ++- 4 files changed, 65 insertions(+), 1 deletions(-) diff --git a/README b/README index a52f3bf..90da375 100644 --- a/README +++ b/README @@ -1279,6 +1279,7 @@ The following options need to be configured: CONFIG_BOOTP_NTPSERVER CONFIG_BOOTP_TIMEOFFSET CONFIG_BOOTP_VENDOREX + CONFIG_BOOTP_OPTIONS CONFIG_BOOTP_SERVERIP - TFTP server will be the serverip environment variable, not the BOOTP server. @@ -1299,6 +1300,12 @@ The following options need to be configured: of the hostname environment variable is passed as option 12 to the DHCP server. + CONFIG_BOOTP_OPTIONS - The environment is checked for the + supported DHCPv4 client options (prefixed with dhcp_), any + found are sent during a DHCP Discover and DHCP Request. + The DHCP server can use this information to conditionally + tailor it's response. s/it's/its/ -- It is of fundamental importance to understand | that the primary recipient of your source code | Email to 'CTZ001' is not the compiler but your coworkers. |at 'email.mot.com' -- KreaTV SW Dev Guidelines | ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [ELF_RELOC] u-boot-arm: elf_reloc branch merged
Hello, this is to let you know that the elf_reloc branch has now been merged into u-boot-arm # master. 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: w...@denx.de Hi there! This is just a note from me, to you, to tell you, the per- son reading this note, that I can't think up any more famous quotes, jokes, nor bizarre stories, so you may as well go home. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] commit powerpc: Remove warm reset entry point does not work on mpc83xx
Peter Tyser pty...@xes-inc.com wrote on 2010/10/19 20:39:41: It seems like my board uses the warm start vector at all times. Padding with 4 nop's after the _start symbol fixes the problem. It might be due to a somewhat peculiar reset design but I cannot understand why. Does this work for everyone else using 83xx? Odd... I don't have an 83xx board to test on unfortunately. Nothing jumps out as being obviously wrong in the assembly: The difference is that I suspect execution starts at 0xXX110 rather than 0xXX100. BTW, I have my reset vector at 0x0 What causes a warm reset? My understanding is that a warm reset on the 8xxx CPUs isn't really a hardware reset - its just when code explicitly jumps to the warm reset entry point. For example, this board used to jump to _start_warm when reset was ran in U-Boot: http://git.denx.de/?p=u-boot.git;a=commitdiff;h=3792d7436e2bf881b6abdede5a481a62b5dedd55 During normal use I thought that the reset entry point was always 0xX100 and a warm reset would never occur. I am not so sure about this. Perhaps the Freescale guys can set us straight? What is the power on reset process like on your board? A bit fuzzy ATM, will have to look at that. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] doc/README.scrapyard: add documentation for abandoned boards
Add a document to maintain a list of boards removed from the current source tree, so archeologists can check more easily if here is something they might want to dig for... Signed-off-by: Wolfgang Denk w...@denx.de --- doc/README.scrapyard | 29 + 1 files changed, 29 insertions(+), 0 deletions(-) create mode 100644 doc/README.scrapyard diff --git a/doc/README.scrapyard b/doc/README.scrapyard new file mode 100644 index 000..a707c6f --- /dev/null +++ b/doc/README.scrapyard @@ -0,0 +1,29 @@ +Over time, support for more and more boards gets added to U-Boot - +while other board support code dies a silent death caused by +negligence in combination with ordinary bitrot. Sometimes this goes +by unnoticed, but often build errors will result. If nobody cares any +more to resolve such problems, then the code is really dead and will +be removed from the U-Boot source tree. The remainders rest in piece +in the imperishable depths of the git history. This document tries to +maintain a list of such former fellows, so archeologists can check +easily if here is something they might want to dig for... + + +Board ArchCPU removed Commit last known maintainer/contact += +NC650 powerpc MPC852 333d86d 2010-10-19Wolfgang Denk w...@denx.de +CP850 powerpc MPC852 333d86d 2010-10-19Wolfgang Denk w...@denx.de +logodl ARM PXA2xx 059e778 2010-10-18August Hoeraendl august.hoera...@gmx.at +CCMpowerpc MPC860 dff07e1 2010-10-06Wolfgang Grandegger w...@denx.de +PCU_E powerpc MPC860T 544d97e 2010-10-06Wolfgang Denk w...@denx.de +spievalpowerpc MPC5200 69434e4 2010-09-19 +smmaco4powerpc MPC5200 9ddc3af 2010-09-19 +HMI10 powerpc MPC823 77efe35 2010-09-19Wolfgang Denk w...@denx.de +GTHpowerpc MPC860 0fe247b 2010-07-17Thomas Lange tho...@corelatus.se +AmigaOneG3SE 953b7e6 2010-06-23 +suzaku microblaze 4f18060 2009-10-03Yasushi Shoji ya...@atmark-techno.com +XUPV2P microblaze 8fab49e 2008-12-10Michal Simek mon...@monstr.eu +MVS1 powerpc MPC823 306620b 2008-08-26Andre Schwarz andre.schw...@matrix-vision.de +adsvix ARM PXA27x 7610db1 2008-07-30Adrian Filipi adrian.fil...@eurotech.com +R5200 ColdFire48ead7a 2008-03-31Zachary P. Landau zachary.lan...@labxtechnologies.com +CPCI440powerpc 440GP b568fd2 2007-12-27Matthias Fuchs matthias.fu...@esd-electronics.com -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] logodl: : remove code for yet another corpse
Dear Graeme Russ, In message 4cac2ea2.5070...@gmail.com you wrote: On 06/10/10 15:50, Reinhard Meyer wrote: ... A text file in doc, like README.historic-boards would suffice, indicating which u-boot release that board was nuked. It would also be good to mention CPU that board used. So anyone looking to support a similar board could have a look and with git its possible to get the old files. Yeah, I think this is a good solution. Maybe mentioning the last known maintainer / major code contributor would also be helpful Good idea. Will try to come up with a patch. Really soon, I mean :-) 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: w...@denx.de There's no sense in being precise when you don't even know what you're talking about. -- John von Neumann ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] commit powerpc: Remove warm reset entry point does not work on mpc83xx
Dear Joakim Tjernlund, In message ofbc383ccf.86b567d6-onc12577c1.006a80d5-c12577c1.006aa...@transmode.se you wrote: During normal use I thought that the reset entry point was always 0xX100 and a warm reset would never occur. I am not so sure about this. Perhaps the Freescale guys can set us straight? Originally U-Boot (well, PPCBoot, to be more precise) had this notion of a warm start, but I quickly learned that this makes little sense in a boot loader. When we execute the reset command,. we usually want to _really_ reset the system into operational mode, including not only the CPU itself but also co-processors (which might be running some form of microcode or DMA), external controllers (to stop them from doing DMA or other data transfers), NOR flash (to make sure it is in read mode so we can execute code from it), etc. Whenever this was not possible (usually due to hardware design features) this almost always was experienced as a bug in U-Boot because there were situations where the board could only be reset through full power cycle. My recommendation is: stop thinking of warm boot; either perform a reset (and that be a real, hard reset of the CPU core and all peripherals), or just continue to run ;-) 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: w...@denx.de Wenn Du ein' weise Antwort verlangst, Mußt Du vernünftig fragen. -- Goethe, Invektiven ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [GIT PULL] Pull request: u-boot-atmel at91
Dear Reinhard Meyer, In message 4cbdab40.3040...@emk-elektronik.de you wrote: Hello Wolfgang, The following changes since commit 1ba91ba23396005ef7b42381cc21f0baf78d0d60: Joakim Tjernlund (1): dlmalloc.c: Fix gcc alias warning are available in the git repository at: git://git.denx.de/u-boot-atmel.git at91 Andreas Bießmann (3): at91rm9200ek: convert to at91 at91rm9200: enable USB support at91rm9200ek: enbable USB support Reinhard Meyer (1): AT91 clock/timer: move static data to global_data struct MAINTAINERS |4 + arch/arm/cpu/arm926ejs/at91/clock.c | 55 +++--- arch/arm/cpu/arm926ejs/at91/timer.c | 85 +- arch/arm/include/asm/arch-at91/hardware.h |1 + arch/arm/include/asm/global_data.h| 14 ++ board/atmel/at91rm9200ek/Makefile |5 - board/atmel/at91rm9200ek/at91rm9200ek.c | 60 ++- board/atmel/at91rm9200ek/config.mk|3 +- board/atmel/at91rm9200ek/led.c| 58 +++--- board/atmel/at91rm9200ek/misc.c | 50 - board/atmel/at91rm9200ek/mux.c| 38 board/atmel/at91rm9200ek/partition.c | 38 boards.cfg|2 +- include/configs/at91rm9200ek.h| 286 + 14 files changed, 221 insertions(+), 478 deletions(-) delete mode 100644 board/atmel/at91rm9200ek/misc.c delete mode 100644 board/atmel/at91rm9200ek/mux.c delete mode 100644 board/atmel/at91rm9200ek/partition.c Applied to u-boot-arm, thanks. 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: w...@denx.de Nobody will ever need more than 640k RAM! -- Bill Gates, 1981 Windows 95 needs at least 8 MB RAM. -- Bill Gates, 1996 Nobody will ever need Windows 95. -- logical conclusion ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] Build: PXA: Fix Vpac270 build variants
Signed-off-by: Marek Vasut marek.va...@gmail.com
---
MAKEALL |3 ---
Makefile | 16
board/vpac270/vpac270.c |2 +-
boards.cfg|3 +++
include/configs/vpac270.h | 12 ++--
5 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/MAKEALL b/MAKEALL
index 6c71943..59ff847 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -339,9 +339,6 @@ LIST_at91= \
LIST_pxa=$(boards_by_cpu pxa)
polaris \
trizepsiv \
- vpac270_nor_128M\
- vpac270_nor_256M\
- vpac270_onenand \
LIST_ixp=$(boards_by_cpu ixp)
diff --git a/Makefile b/Makefile
index 25e8fc8..8078d71 100644
--- a/Makefile
+++ b/Makefile
@@ -1018,22 +1018,6 @@ trizepsiv_config : unconfig
fi;
@$(MKCONFIG) -n $@ -a trizepsiv arm pxa trizepsiv
-vpac270_nor_256M_config \
-vpac270_nor_128M_config \
-vpac270_onenand_config : unconfig
- @mkdir -p $(obj)include
- @if [ $(findstring onenand,$@) ] ; then \
- echo #define CONFIG_ONENAND_U_BOOT \
- $(obj)include/config.h ; \
- echo #define CONFIG_256M_U_BOOT \
- $(obj)include/config.h ; \
- fi;
- @if [ $(findstring 256M,$@) ] ; then \
- echo #define CONFIG_256M_U_BOOT \
- $(obj)include/config.h ; \
- fi;
- @$(MKCONFIG) -n $@ -a vpac270 arm pxa vpac270
-
#
## ARM1136 Systems
#
diff --git a/board/vpac270/vpac270.c b/board/vpac270/vpac270.c
index 91d8580..43bbdff 100644
--- a/board/vpac270/vpac270.c
+++ b/board/vpac270/vpac270.c
@@ -66,7 +66,7 @@ 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_256M_U_BOOT
+#ifdef CONFIG_RAM_256M
gd-bd-bi_dram[1].start = PHYS_SDRAM_2;
gd-bd-bi_dram[1].size = PHYS_SDRAM_2_SIZE;
#endif
diff --git a/boards.cfg b/boards.cfg
index 5d43f3d..b8365f7 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -62,6 +62,9 @@ lubbock arm pxa
palmld arm pxa
palmtc arm pxa
pleb2 arm pxa
+vpac270_nor_128arm pxa vpac270 -
- vpac270:NOR,RAM_128M
+vpac270_nor_256arm pxa vpac270 -
- vpac270:NOR,RAM_256M
+vpac270_ond_256arm pxa vpac270 -
- vpac270:ONENAND,RAM_256M
xaeniaxarm pxa
xm250 arm pxa
zipitz2arm pxa
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index fc680fc..c9d9c69 100644
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -75,7 +75,7 @@
#undef CONFIG_LCD
#defineCONFIG_CMD_IDE
-#ifdef CONFIG_ONENAND_U_BOOT
+#ifdef CONFIG_ONENAND
#undef CONFIG_CMD_FLASH
#defineCONFIG_CMD_ONENAND
#else
@@ -165,13 +165,13 @@
#definePHYS_SDRAM_10xa000 /* SDRAM Bank
#1 */
#definePHYS_SDRAM_1_SIZE 0x0800 /* 128 MB */
-#ifdef CONFIG_256M_U_BOOT
+#ifdef CONFIG_RAM_256M
#definePHYS_SDRAM_20x8000 /* SDRAM Bank
#2 */
#definePHYS_SDRAM_2_SIZE 0x0800 /* 128 MB */
#endif
#defineCONFIG_SYS_DRAM_BASE0xa000 /* CS0 */
-#ifdef CONFIG_256M_U_BOOT
+#ifdef CONFIG_RAM_256M
#defineCONFIG_SYS_DRAM_SIZE0x1000 /* 256 MB DRAM
*/
#else
#defineCONFIG_SYS_DRAM_SIZE0x0800 /* 128 MB DRAM
*/
@@ -198,7 +198,7 @@
#ifdefined(CONFIG_CMD_FLASH) /* NOR */
#definePHYS_FLASH_10x /* Flash Bank
#1 */
-#ifdef CONFIG_256M_U_BOOT
+#ifdef CONFIG_RAM_256M
#definePHYS_FLASH_20x0200 /* Flash Bank
#2 */
#endif
@@ -206,7 +206,7 @@
#defineCONFIG_FLASH_CFI_DRIVER 1
#defineCONFIG_SYS_MAX_FLASH_SECT (4 + 255)
-#ifdef CONFIG_256M_U_BOOT
+#ifdef CONFIG_RAM_256M
#defineCONFIG_SYS_MAX_FLASH_BANKS 2
#defineCONFIG_SYS_FLASH_BANKS_LIST { PHYS_FLASH_1, PHYS_FLASH_2 }
#else
@@ -308,7 +308,7 @@
#defineCONFIG_SYS_MSC0_VAL 0x3ffc95fa
#defineCONFIG_SYS_MSC1_VAL 0x02ccf974
#defineCONFIG_SYS_MSC2_VAL 0x
-#ifdef CONFIG_256M_U_BOOT
+#ifdef CONFIG_RAM_256M
#defineCONFIG_SYS_MDCNFG_VAL 0x8ad30ad3
#else
#defineCONFIG_SYS_MDCNFG_VAL 0x88000ad3
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] Build: PXA: Fix TrizepsIV build variants
Signed-off-by: Marek Vasut marek.va...@gmail.com --- MAKEALL |5 + Makefile|8 board/trizepsiv/conxs.c |2 +- boards.cfg |2 ++ 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/MAKEALL b/MAKEALL index 59ff847..1a96b0f 100755 --- a/MAKEALL +++ b/MAKEALL @@ -336,10 +336,7 @@ LIST_at91=\ ## Xscale Systems # -LIST_pxa=$(boards_by_cpu pxa) - polaris \ - trizepsiv \ - +LIST_pxa=$(boards_by_cpu pxa) LIST_ixp=$(boards_by_cpu ixp) pdnb3 \ diff --git a/Makefile b/Makefile index 8078d71..9dcd59d 100644 --- a/Makefile +++ b/Makefile @@ -1010,14 +1010,6 @@ scpu_config: unconfig fi @$(MKCONFIG) -n $@ -a pdnb3 arm ixp pdnb3 prodrive -polaris_config \ -trizepsiv_config : unconfig - @mkdir -p $(obj)include - @if [ $(findstring polaris,$@) ] ; then \ - echo #define CONFIG_POLARIS 1 $(obj)include/config.h ; \ - fi; - @$(MKCONFIG) -n $@ -a trizepsiv arm pxa trizepsiv - # ## ARM1136 Systems # diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c index 7fac73d..0c67367 100644 --- a/board/trizepsiv/conxs.c +++ b/board/trizepsiv/conxs.c @@ -45,7 +45,7 @@ extern struct serial_device serial_ffuart_device; extern struct serial_device serial_btuart_device; extern struct serial_device serial_stuart_device; -#if CONFIG_POLARIS +#if CONFIG_MK_POLARIS #define BOOT_CONSOLE serial_stuart #else #define BOOT_CONSOLE serial_ffuart diff --git a/boards.cfg b/boards.cfg index b8365f7..97b5343 100644 --- a/boards.cfg +++ b/boards.cfg @@ -62,6 +62,8 @@ lubbock arm pxa palmld arm pxa palmtc arm pxa pleb2 arm pxa +polarisarm pxa trizepsiv - - trizepsiv:POLARIS +trizepsiv arm pxa vpac270_nor_128arm pxa vpac270 - - vpac270:NOR,RAM_128M vpac270_nor_256arm pxa vpac270 - - vpac270:NOR,RAM_256M vpac270_ond_256arm pxa vpac270 - - vpac270:ONENAND,RAM_256M -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] NC650/CP650: remove code for yet another corpse
Dear Wolfgang Denk, In message 1287480529-22164-1-git-send-email...@denx.de you wrote: The NC650 / CP650 boards have long been unmaintained and left broken. As obviously nobody is interested in that code any more, we may as well remove it. Signed-off-by: Wolfgang Denk w...@denx.de --- MAINTAINERS |1 - board/nc650/Makefile | 45 board/nc650/flash.c | 542 -- board/nc650/nand.c | 110 - board/nc650/nc650.c | 309 board/nc650/u-boot.lds | 126 -- board/nc650/u-boot.lds.debug | 125 -- boards.cfg |3 - include/configs/NC650.h | 451 --- 9 files changed, 0 insertions(+), 1712 deletions(-) delete mode 100644 board/nc650/Makefile delete mode 100644 board/nc650/flash.c delete mode 100644 board/nc650/nand.c delete mode 100644 board/nc650/nc650.c delete mode 100644 board/nc650/u-boot.lds delete mode 100644 board/nc650/u-boot.lds.debug delete mode 100644 include/configs/NC650.h Applied (after fixing the board name CP850 in the commit message.) 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: w...@denx.de Overdrawn? But I still have checks left! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] doc/README.scrapyard: add documentation for abandoned boards
In message 1287517804-29731-1-git-send-email...@denx.de I wrote: Add a document to maintain a list of boards removed from the current source tree, so archeologists can check more easily if here is something they might want to dig for... Signed-off-by: Wolfgang Denk w...@denx.de --- doc/README.scrapyard | 29 + 1 files changed, 29 insertions(+), 0 deletions(-) create mode 100644 doc/README.scrapyard Applied. 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: w...@denx.de First study the enemy. Seek weakness. -- Romulan Commander, Balance of Terror, stardate 1709.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PULL] U-Boot-pxa pull request
Hi,
please pull my git://git.denx.de/u-boot-pxa for-wd-testing branch into your u-
boot-testing/Makefile-cleanup branch. Thanks
The following changes since commit a5cb985d8006bd1bb6d188b84f435f5d007fd6ac:
Makefile: move all Power Architecture boards into boards.cfg (2010-10-17
01:34:08 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-pxa.git for-wd-testing
Marek Vasut (19):
PXA: pxafb: Fix indent problems
PXA: pxa-regs.h cleanup
PXA: pxafb: Add ACX517AKN support
PXA: pxafb: Add support for Sharp LQ038J7DH53
PXA: pxafb: Marvell Littleton LCD definition
common: Enable serial for PXA250
PXA: Palm Tungsten|C Support
PXA: Add initial Palm LifeDrive support
PXA: Voipac270 improvements
PXA: Balloon3 board support
PXA: Add missing MAINTAINERS entries
PXA: Add necessary information for RELOC
PXA: Fix reloc, Push lowlevel init into C code
PXA: Fix vpac270 for Reloc
PXA: Fix ZipitZ2 for Reloc
PXA: Fix Balloon3 for Reloc
PXA: Fix vpac270 OneNAND booter
Build: PXA: Fix Vpac270 build variants
Build: PXA: Fix TrizepsIV build variants
Mikhail Kshevetskiy (4):
PXA: remove unused u-boot.lds from board/vpac270
PXA: cleanup vpac270 config and set CONFIG_SYS_HZ to 1000
PXA: fix environment sector size, kernel and environment location for
vpac270
PXA: fix MDREFR[APD] bit setting
MAINTAINERS |9 +
MAKEALL |7 +-
Makefile | 17 -
arch/arm/cpu/pxa/cpu.c| 255 +++-
arch/arm/cpu/pxa/i2c.c| 69 +-
arch/arm/cpu/pxa/pxafb.c | 365 +++--
arch/arm/cpu/pxa/start.S | 346 ++---
arch/arm/cpu/pxa/timer.c |7 +-
arch/arm/cpu/pxa/usb.c| 61 +-
arch/arm/include/asm/arch-pxa/hardware.h | 61 +-
arch/arm/include/asm/arch-pxa/macro.h | 20 +-
arch/arm/include/asm/arch-pxa/pxa-regs.h | 2688 +++--
board/balloon3/Makefile | 47 +
board/balloon3/balloon3.c | 238 +++
board/colibri_pxa270/colibri_pxa270.c | 33 +-
board/cradle/cradle.c |5 +-
board/cradle/lowlevel_init.S |4 +-
board/csb226/csb226.c | 13 +-
board/delta/delta.c | 37 +-
board/delta/nand.c| 110 +-
board/innokom/innokom.c | 14 +-
board/palmld/Makefile | 49 +
board/palmld/config.mk|1 +
board/{zipitz2 = palmld}/lowlevel_init.S |9 +-
board/palmld/palmld.c | 69 +
board/{vpac270 = palmld}/u-boot.lds |7 +-
board/palmtc/Makefile | 49 +
board/palmtc/config.mk|1 +
board/{vpac270 = palmtc}/lowlevel_init.S |3 +-
board/palmtc/palmtc.c | 59 +
board/{vpac270 = palmtc}/u-boot.lds |7 +-
board/pxa255_idp/pxa_idp.c| 27 +-
board/trizepsiv/conxs.c | 35 +-
board/vpac270/Makefile| 17 +-
board/vpac270/config.mk |1 -
board/vpac270/vpac270.c | 92 +-
board/wepep250/wepep250.c | 11 +-
board/zipitz2/Makefile| 10 +-
board/zipitz2/config.mk |1 -
board/zipitz2/zipitz2.c | 57 +-
board/zylonite/nand.c | 110 +-
boards.cfg|8 +
common/serial.c |2 +-
drivers/mmc/pxa_mmc.c | 98 +-
drivers/serial/serial_pxa.c | 94 +-
include/configs/balloon3.h| 274 +++
include/configs/cerf250.h |3 +
include/configs/colibri_pxa270.h |3 +
include/configs/cradle.h |5 +-
include/configs/csb226.h |3 +
include/configs/delta.h |4 +
include/configs/innokom.h |3 +
include/configs/lubbock.h |3 +
include/configs/palmld.h | 276 +++
include/configs/palmtc.h | 248 +++
include/configs/pleb2.h |3 +
include/configs/pxa255_idp.h |3 +
include/configs/trizepsiv.h |3 +
include/configs/vpac270.h | 138 +-
include/configs/wepep250.h|4 +
include/configs/xaeniax.h |3 +
include/configs/xm250.h |3 +
include/configs/xsengine.h|3 +
include/configs/zipitz2.h | 10 +-
include/configs/zylonite.h|3 +
onenand_ipl/board/vpac270/Makefile|5 +-
66 files changed, 4017 insertions(+),
Re: [U-Boot] [Patch v3 1/7] Expand POST memory test to support arch-depended implementation.
Dear York Sun, In message 1285712437-6719-1-git-send-email-york...@freescale.com you wrote: Add weak functions to enable architecture depended preparation, address advancing, cleaning up and error handling. These weak functions provides the framwork to implemente arch/platform dependent code for initializing/maintenance/restore the start address, size, physical address as well as memory mapping before/between/after memory test. arch_memory_failure_handle can also be implemented in case more care is needed for arch/platform. Signed-off-by: York Sun york...@freescale.com --- post/drivers/memory.c | 68 +--- 1 files changed, 52 insertions(+), 16 deletions(-) Applied, thanks. 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: w...@denx.de Let's say the docs present a simplified view of reality...:-) - Larry Wall in 6...@jpl-devvax.jpl.nasa.gov ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PULL] U-Boot-pxa pull request
Dear Marek Vasut, In message 201010192228.34814.marek.va...@gmail.com you wrote: Hi, please pull my git://git.denx.de/u-boot-pxa for-wd-testing branch into your u- boot-testing/Makefile-cleanup branch. Thanks The following changes since commit a5cb985d8006bd1bb6d188b84f435f5d007fd6ac: Makefile: move all Power Architecture boards into boards.cfg (2010-10-17 01:34:08 +0200) are available in the git repository at: git://git.denx.de/u-boot-pxa.git for-wd-testing I send you the result of the pull off list. You really need to reabse your tree: - cd u-boot-arm/ - git remote update ... - git pull u-boot-pxa.git for-wd-testing From git://git.denx.de/u-boot-pxa * branchfor-wd-testing - FETCH_HEAD CONFLICT (rename/rename): Rename board/LEOX/elpt860/config.mk-board/ttcontrol/vision2/Makefile in branch HEAD rename board/LEOX/elpt860/config.mk-board/balloon3/Makefile in 8e3615e158283ff8463710aff12747dc60bb1a07 CONFLICT (rename/delete): Rename board/Marvell/db64360/config.mk-board/isee/igep0030/config.mk in HEAD and deleted in 8e3615e158283ff8463710aff12747dc60bb1a07 CONFLICT (rename/delete): Rename board/RPXlite_dw/config.mk-board/ttcontrol/vision2/config.mk in HEAD and deleted in 8e3615e158283ff8463710aff12747dc60bb1a07 CONFLICT (rename/delete): Rename board/a3000/config.mk-board/palmtc/Makefile in 8e3615e158283ff8463710aff12747dc60bb1a07 and deleted in HEAD CONFLICT (rename/delete): Rename board/amcc/makalu/config.mk-board/armltd/vexpress/config.mk in HEAD and deleted in 8e3615e158283ff8463710aff12747dc60bb1a07 Renaming board/fads/config.mk = board/armltd/vexpress/Makefile Auto-merging board/armltd/vexpress/Makefile CONFLICT (rename/modify): Merge conflict in board/armltd/vexpress/Makefile Renaming board/galaxy5200/config.mk = board/isee/igep0030/Makefile Auto-merging board/isee/igep0030/Makefile CONFLICT (rename/modify): Merge conflict in board/isee/igep0030/Makefile CONFLICT (rename/rename): Rename board/logodl/Makefile-board/a4m072/Makefile in branch HEAD rename board/logodl/Makefile-board/palmld/Makefile in 8e3615e158283ff8463710aff12747dc60bb1a07 Renaming board/matrix_vision/mvbc_p/config.mk = board/a4m072/config.mk Auto-merging board/a4m072/config.mk CONFLICT (rename/modify): Merge conflict in board/a4m072/config.mk CONFLICT (rename/delete): Rename board/pdm360ng/config.mk-board/isee/igep0020/config.mk in HEAD and deleted in 8e3615e158283ff8463710aff12747dc60bb1a07 CONFLICT (rename/delete): Rename board/siemens/IAD210/config.mk-board/isee/igep0020/Makefile in HEAD and deleted in 8e3615e158283ff8463710aff12747dc60bb1a07 Auto-merging MAINTAINERS Auto-merging MAKEALL Auto-merging Makefile Auto-merging README Auto-merging arch/arm/cpu/arm1136/start.S CONFLICT (content): Merge conflict in arch/arm/cpu/arm1136/start.S Auto-merging arch/arm/cpu/arm1176/start.S Auto-merging arch/arm/cpu/arm720t/start.S Auto-merging arch/arm/cpu/arm920t/start.S Auto-merging arch/arm/cpu/arm925t/start.S Auto-merging arch/arm/cpu/arm926ejs/start.S CONFLICT (content): Merge conflict in arch/arm/cpu/arm926ejs/start.S Auto-merging arch/arm/cpu/arm946es/start.S Auto-merging arch/arm/cpu/arm_intcm/start.S Auto-merging arch/arm/cpu/armv7/start.S Auto-merging arch/arm/cpu/ixp/start.S Auto-merging arch/arm/cpu/lh7a40x/start.S Auto-merging arch/arm/cpu/pxa/start.S CONFLICT (content): Merge conflict in arch/arm/cpu/pxa/start.S Auto-merging arch/arm/cpu/s3c44b0/start.S Auto-merging arch/arm/cpu/sa1100/start.S Auto-merging arch/microblaze/cpu/start.S Auto-merging arch/microblaze/lib/board.c Auto-merging arch/powerpc/cpu/mpc85xx/start.S Auto-merging arch/powerpc/cpu/mpc86xx/start.S Auto-merging arch/powerpc/lib/board.c Auto-merging board/LaCie/edminiv2/config.mk CONFLICT (content): Merge conflict in board/LaCie/edminiv2/config.mk CONFLICT (delete/modify): board/alaska/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/alaska/config.mk left in tree. Auto-merging board/atmel/at91rm9200ek/config.mk CONFLICT (content): Merge conflict in board/atmel/at91rm9200ek/config.mk CONFLICT (delete/modify): board/bc3450/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/bc3450/config.mk left in tree. CONFLICT (delete/modify): board/canmb/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/canmb/config.mk left in tree. CONFLICT (delete/modify): board/cm5200/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/cm5200/config.mk left in tree. CONFLICT (delete/modify): board/digsy_mtc/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/digsy_mtc/config.mk left in
Re: [U-Boot] commit powerpc: Remove warm reset entry point does not work on mpc83xx
Wolfgang Denk w...@denx.de wrote on 2010/10/19 22:04:17: Dear Joakim Tjernlund, In message OFBC383CCF.86B567D6-ONC12577C1.006A80D5-C12577C1. 006aa...@transmode.se you wrote: During normal use I thought that the reset entry point was always 0xX100 and a warm reset would never occur. I am not so sure about this. Perhaps the Freescale guys can set us straight? Originally U-Boot (well, PPCBoot, to be more precise) had this notion of a warm start, but I quickly learned that this makes little sense in a boot loader. When we execute the reset command,. we usually want to _really_ reset the system into operational mode, including not only the CPU itself but also co-processors (which might be running some form of microcode or DMA), external controllers (to stop them from doing DMA or other data transfers), NOR flash (to make sure it is in read mode so we can execute code from it), etc. Whenever this was not possible (usually due to hardware design features) this almost always was experienced as a bug in U-Boot because there were situations where the board could only be reset through full power cycle. My recommendation is: stop thinking of warm boot; either perform a reset (and that be a real, hard reset of the CPU core and all peripherals), or just continue to run ;-) We do. Even have a HRESET button and it still doesn't work. There is one thing though: At address 0x100(and 0x110) we have a branch to where the boot is really located. This is because we have small sectors in the beginning of the flash and we want to use those as environment etc. Jocke ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] commit powerpc: Remove warm reset entry point does not work on mpc83xx
Dear Joakim Tjernlund, In message of7ebfc833.2f0e9c3d-onc12577c1.00737e7a-c12577c1.0073e...@transmode.se you wrote: There is one thing though: At address 0x100(and 0x110) we have a branch to where the boot is really located. This is because we have small sectors in the beginning of the flash and we want to use those as environment etc. Why don't you use the rest of this sector for code? All you need to do is adapt the linker script a bit... Without that - where is your exception handler code? This is supposed to be there, too... 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: w...@denx.de The management question ... is not _whether_ to build a pilot system and throw it away. You _will_ do that. The only question is whether to plan in advance to build a throwaway, or to promise to deliver the throwaway to customers. - Fred Brooks, The Mythical Man Month ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] commit powerpc: Remove warm reset entry point does not work on mpc83xx
Wolfgang Denk w...@denx.de wrote on 2010/10/19 23:13:59: Dear Joakim Tjernlund, In message OF7EBFC833.2F0E9C3D-ONC12577C1.00737E7A-C12577C1. 0073e...@transmode.se you wrote: There is one thing though: At address 0x100(and 0x110) we have a branch to where the boot is really located. This is because we have small sectors in the beginning of the flash and we want to use those as environment etc. Why don't you use the rest of this sector for code? All you need to do is adapt the linker script a bit... Without that - where is your exception handler code? This is supposed to be there, too... ah, this is only during the early steps. The flash gets mapped to 0xf000 and RAM is mapped to 0x0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Patch V2] update board EB+CPUx9K2
Dear Jens Scharsig, In message 4cbdd74b.8030...@scharsoft.de you wrote: * update to support arm reloaction * unnecessary environment variables removed Signed-off-by: Jens Scharsig js_at...@scharsoft.de --- changes since V1 * make conform with Rename TEXT_BASE into CONFIG_SYS_TEXT_BASE patch board/BuS/eb_cpux9k2/config.mk |1 - board/BuS/eb_cpux9k2/cpux9k2.c |7 +++ include/configs/eb_cpux9k2.h | 23 --- 3 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 board/BuS/eb_cpux9k2/config.mk Applied to u-boot-arm. Thanks. 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: w...@denx.de Here's a fish hangs in the net like a poor man's right in the law. 'Twill hardly come out. - Shakespeare, Pericles, Act II, Scene 1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] boards.cfg: update local documentation
Dear Mike Frysinger, In message 1287470980-30991-1-git-send-email-vap...@gentoo.org you wrote: The options field at the moment is only documented in the changelog which isn't terribly useful to people without git. Signed-off-by: Mike Frysinger vap...@gentoo.org --- boards.cfg | 14 +++--- 1 files changed, 11 insertions(+), 3 deletions(-) Applied, thanks. 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: w...@denx.de We are Microsoft. Unix is irrelevant. Openness is futile. Prepare to be assimilated. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
