Re: [U-Boot] [U-BOOT] [PATCH] env: reduce the stack footprint for the env buf
Dear Lei Wen, In message aanlktin-ebt+pa0tmdlbpaqo3pbjwmbnldfuj2k-j...@mail.gmail.com you wrote: In which way do you think this will save any memory? This patch is not intend to save memory... Then I don't understand at all what the benefit of that patch would be. One of our project need to confine the ddr usage of uboot in the smallest case, not to pollute other area. So for us, the small stack is good one... So it is still about saving memory... For now the uboot is relocated to the end of the dram, and malloc area is almost a fix value, uboot would live happily in this area. But for env case, it allocate a range which could be large, due to the CONFIG_ENV_SIZE could be a big one, in the stack range. Because the stack is grown downwards, so it takes more memory range than it is allocated in the malloc method. malloc arena and stack are adjacent. If you have enough free room in the malloc arena for the environment buffers, but cannot afford to have them on your stack, then this means your malloc arena has lots of unused space. Decrease the size of your malloc arena by the size of the environment buffer, and you reach the same goal as with your patch - actually you save more memory, as the code size of u-boot shrinks. Can you please provide exact numbers? How big is your RAM? What is the debug output of arch/*/lib/board.c without and with this patch on your system? How big is your environment resp. the environment sectors? 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 Voodoo Programming: Things programmers do that they know shouldn't work but they try anyway, and which sometimes actually work, such as recompiling everything. - Karl Lehenbauer ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-BOOT] [PATCH] env: reduce the stack footprint for the env buf
On 05/02/11 19:30, Wolfgang Denk wrote: Dear Lei Wen, In message aanlktin-ebt+pa0tmdlbpaqo3pbjwmbnldfuj2k-j...@mail.gmail.com you wrote: In which way do you think this will save any memory? This patch is not intend to save memory... Then I don't understand at all what the benefit of that patch would be. One of our project need to confine the ddr usage of uboot in the smallest case, not to pollute other area. So for us, the small stack is good one... So it is still about saving memory... For now the uboot is relocated to the end of the dram, and malloc area is almost a fix value, uboot would live happily in this area. But for env case, it allocate a range which could be large, due to the CONFIG_ENV_SIZE could be a big one, in the stack range. Because the stack is grown downwards, so it takes more memory range than it is allocated in the malloc method. Sounds like you have allocated too small a region for your stack - try increasing CONFIG_SYS_STACK_SIZE and decreasing CONFIG_SYS_MALLOC_LEN malloc arena and stack are adjacent. If you have enough free room in the malloc arena for the environment buffers, but cannot afford to have them on your stack, then this means your malloc arena has lots of unused space. Decrease the size of your malloc arena by the size of the environment buffer, and you reach the same goal as with your patch - actually you save more memory, as the code size of u-boot shrinks. Can you please provide exact numbers? How big is your RAM? What is the debug output of arch/*/lib/board.c without and with this patch on your system? How big is your environment resp. the environment sectors? The only other thing I could think of that would make sense would be having the malloc heap in a completely different memory segment to the stack - odd, but possible Regards, Graeme ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Fix gunzip to work for any gziped uImage size
Le 04/02/2011 13:35, Catalin Radu a écrit : Signed-off-by: Catalin Raducata...@virtualmetrix.com This is a V2 patch, right? So it should be marked as such and patch history should be added, see http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2] EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX
Hi Stefano, Le 04/02/2011 16:30, Stefano Babic a écrit : On 02/03/2011 03:19 PM, Loïc Minier wrote: Upstream linux moved from MACH_TYPE_MX51_LANGE51 to MACH_TYPE_MX51_EFIKAMX. Signed-off-by: Loïc Minierloic.min...@linaro.org --- Changes for V2: * Add Signed-off-by Applied to u-boot-imx, as this is a fix, thanks. Best regards, Stefano Babic Do you intend to send out a new pull request for -rc2? -- not hurrying you, just asking. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/3] MIPS: Purple: Fix multiple definition error on final linking of u-boot binary
On 02/03/2011 08:59 PM, daniel.schwierz...@googlemail.com wrote:
The linker of recent toolchains complains about multiple definitions
on final linking of u-boot binary. This patch removes all redundant
object files from u-boot.lds those are already added to .text section
by the linker.
Confirmed.
That patch could not be tested but the resulting u-boot.map still looks
good. The start symbol is at 0xB000, the environment at 0xB0008000
so u-boot should boot.
Agreed.
--- a/board/purple/u-boot.lds
+++ b/board/purple/u-boot.lds
@@ -36,11 +36,6 @@ SECTIONS
{
arch/mips/cpu/start.o (.text)
board/purple/lowlevel_init.o (.text)
- arch/mips/cpu/cache.o (.text)
- common/main.o (.text)
- common/dlmalloc.o (.text)
- common/cmd_boot.o (.text)
- lib/zlib.o(.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.ppcenv)
This is ok, though we have some room for further cealnups. With having
.text statement in the lowlevel_init.S, we could remove all these lines.
Applied anyway, thanks for the patch.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2 V3] at91sam9261ek: make operational again
Since U-boot v2010.12 the support for the at91sam9261ek board is broken.
This patch solves this issue. This change has been tested on this board.
Note: It requires that the 1st stage bootloader (like Atmel at91-bootstrap)
to load U-boot at a different address compared to previous releases of
U-boot due to conflicts in the BSS area during relocation.
(0x23f0 - -0x20a0)
Signed-off-by: Remy Bohmer li...@bohmer.net
---
V3: This patch applied to either mainstream or the u-boot-atmel branch
It contains all changes required to make mainstream work again for
this board.
This patch can be pulled from:
git://git.denx.de/u-boot-usb.git - fix-at91sam9261ek
board/atmel/at91sam9261ek/Makefile|6 +-
board/atmel/at91sam9261ek/at91sam9261ek.c |7 +-
board/atmel/at91sam9261ek/config.mk |1 -
include/configs/at91sam9261ek.h | 129
4 files changed, 81 insertions(+), 62 deletions(-)
delete mode 100644 board/atmel/at91sam9261ek/config.mk
diff --git a/board/atmel/at91sam9261ek/Makefile
b/board/atmel/at91sam9261ek/Makefile
index 9d20ba0..3351493 100644
--- a/board/atmel/at91sam9261ek/Makefile
+++ b/board/atmel/at91sam9261ek/Makefile
@@ -29,13 +29,13 @@ include $(TOPDIR)/config.mk
LIB= $(obj)lib$(BOARD).o
-COBJS-y += at91sam9261ek.o
+COBJS-y += $(BOARD).o
COBJS-y += led.o
COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o
-SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS-y))
-SOBJS := $(addprefix $(obj),$(SOBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS-y))
$(LIB):$(obj).depend $(OBJS) $(SOBJS)
$(call cmd_link_o_target, $(OBJS) $(SOBJS))
diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c
b/board/atmel/at91sam9261ek/at91sam9261ek.c
index de5cfae..25c181e 100644
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -246,7 +246,7 @@ int board_init(void)
gd-bd-bi_arch_number = MACH_TYPE_AT91SAM9261EK;
#endif
/* adress of boot parameters */
- gd-bd-bi_boot_params = PHYS_SDRAM + 0x100;
+ gd-bd-bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
at91_serial_hw_init();
#ifdef CONFIG_CMD_NAND
@@ -273,8 +273,9 @@ int board_eth_init(bd_t *bis)
int dram_init(void)
{
- gd-bd-bi_dram[0].start = PHYS_SDRAM;
- gd-bd-bi_dram[0].size = PHYS_SDRAM_SIZE;
+ /* dram_init must store complete ramsize in gd-ram_size */
+ gd-ram_size = get_ram_size((volatile long *)CONFIG_SYS_SDRAM_BASE,
+ CONFIG_SYS_SDRAM_SIZE);
return 0;
}
diff --git a/board/atmel/at91sam9261ek/config.mk
b/board/atmel/at91sam9261ek/config.mk
deleted file mode 100644
index e554a45..000
--- a/board/atmel/at91sam9261ek/config.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SYS_TEXT_BASE = 0x23f0
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 401478b..d601dad 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -29,34 +29,42 @@
#define CONFIG_AT91_LEGACY
+/*
+ * WARNING:
+ * The initial boot program needs to be adapted such that it loads U-boot
+ * at the provided TEXT_BASE below. Note that the Atmel AT91-bootstrap loader
+ * might be configured such that it loads U-boot at 0x23f0. But since
+ * U-boot is now being relocated to the end of RAM, this will result in a
+ * lockup during boot due to an overlap in the BSS segment. So, we choose a
+ * safe load adress to begin with, namely 0x20a0
+ */
+#define CONFIG_SYS_TEXT_BASE 0x20a0
+
/* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */
-#define CONFIG_SYS_HZ 1000
+#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */
+#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* main clock xtal */
+#define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core*/
+/* Define actual evaluation board type from used processor type */
#ifdef CONFIG_AT91SAM9G10EK
#define CONFIG_AT91SAM9G10 1 /* It's an Atmel AT91SAM9G10 SoC*/
#else
#define CONFIG_AT91SAM9261 1 /* It's an Atmel AT91SAM9261 SoC*/
#endif
+#define CONFIG_AT91FAMILY
+
+/* Misc CPU related */
#define CONFIG_ARCH_CPU_INIT
#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
-
-#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG 1
+#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_INITRD_TAG
#define CONFIG_SKIP_LOWLEVEL_INIT
-/*
- * Hardware drivers
- */
-#define CONFIG_AT91_GPIO 1
-#define CONFIG_ATMEL_USART 1
-#undef CONFIG_USART0
-#undef CONFIG_USART1
-#undef CONFIG_USART2
-#define
[U-Boot] [PATCH 2/2 V1] Make at91sam9261ek and at91sam9g10ek work again
Also removes CONFIG_AT91_LEGACY related stuff.
Signed-off-by: Remy Bohmer li...@bohmer.net
---
V1: This patch contains everything to make the boards work again on
the current changes in the u-boot-atmel.git tree.
It requires the mainstream fixes to be applied first
([PATCH 1/2 V3] at91sam9261ek: make operational again)
This patch-series can be pulled from:
git://git.denx.de/u-boot-usb.git - fix-at91sam9261ek
Makefile | 23
arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c | 31 +++--
arch/arm/cpu/arm926ejs/at91/led.c |1 -
arch/arm/include/asm/arch-at91/at91_matrix.h | 17 ++-
arch/arm/include/asm/arch-at91/at91sam9261.h |1 +
.../arm/include/asm/arch-at91/at91sam9261_matrix.h | 64 -
board/atmel/at91sam9261ek/at91sam9261ek.c | 140 +++-
board/atmel/at91sam9261ek/led.c|8 +-
boards.cfg |6 +
doc/README.at91|3 +-
include/configs/at91sam9261ek.h| 27 ++--
11 files changed, 127 insertions(+), 194 deletions(-)
delete mode 100644 arch/arm/include/asm/arch-at91/at91sam9261_matrix.h
diff --git a/Makefile b/Makefile
index 770fb0d..e934b75 100644
--- a/Makefile
+++ b/Makefile
@@ -759,29 +759,6 @@ CPUAT91_config : unconfig
## ARM926EJ-S Systems
#
-at91sam9261ek_nandflash_config \
-at91sam9261ek_dataflash_cs0_config \
-at91sam9261ek_dataflash_cs3_config \
-at91sam9261ek_config \
-at91sam9g10ek_nandflash_config \
-at91sam9g10ek_dataflash_cs0_config \
-at91sam9g10ek_dataflash_cs3_config \
-at91sam9g10ek_config : unconfig
- @mkdir -p $(obj)include
- @if [ $(findstring 9g10,$@) ] ; then \
- echo #define CONFIG_AT91SAM9G10EK 1
$(obj)include/config.h ; \
- else \
- echo #define CONFIG_AT91SAM9261EK 1
$(obj)include/config.h ; \
- fi;
- @if [ $(findstring _nandflash,$@) ] ; then \
- echo #define CONFIG_SYS_USE_NANDFLASH 1
$(obj)include/config.h ; \
- elif [ $(findstring dataflash_cs0,$@) ] ; then \
- echo #define CONFIG_SYS_USE_DATAFLASH_CS3 1
$(obj)include/config.h ; \
- else \
- echo #define CONFIG_SYS_USE_DATAFLASH_CS0 1
$(obj)include/config.h ; \
- fi;
- @$(MKCONFIG) -n $@ -a at91sam9261ek arm arm926ejs at91sam9261ek atmel
at91
-
at91sam9263ek_norflash_config \
at91sam9263ek_norflash_boot_config \
at91sam9263ek_nandflash_config \
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c
b/arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c
index b4353ef..0e2c196 100644
--- a/arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c
+++ b/arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c
@@ -23,45 +23,46 @@
*/
#include common.h
+#include asm/io.h
+#include asm/arch/at91sam9261.h
#include asm/arch/at91_common.h
#include asm/arch/at91_pmc.h
#include asm/arch/gpio.h
-#include asm/arch/io.h
void at91_serial0_hw_init(void)
{
- at91_pmc_t *pmc= (at91_pmc_t *) AT91_PMC_BASE;
+ at91_pmc_t *pmc= (at91_pmc_t *) ATMEL_BASE_PMC;
at91_set_a_periph(AT91_PIO_PORTC, 8, 1);/* TXD0 */
at91_set_a_periph(AT91_PIO_PORTC, 9, 0);/* RXD0 */
- writel(1 AT91SAM9261_ID_US0, pmc-pcer);
+ writel(1 ATMEL_ID_USART0, pmc-pcer);
}
void at91_serial1_hw_init(void)
{
- at91_pmc_t *pmc= (at91_pmc_t *) AT91_PMC_BASE;
+ at91_pmc_t *pmc= (at91_pmc_t *) ATMEL_BASE_PMC;
at91_set_a_periph(AT91_PIO_PORTC, 12, 1); /* TXD1 */
at91_set_a_periph(AT91_PIO_PORTC, 13, 0); /* RXD1 */
- writel(1 AT91SAM9261_ID_US1, pmc-pcer);
+ writel(1 ATMEL_ID_USART1, pmc-pcer);
}
void at91_serial2_hw_init(void)
{
- at91_pmc_t *pmc= (at91_pmc_t *) AT91_PMC_BASE;
+ at91_pmc_t *pmc= (at91_pmc_t *) ATMEL_BASE_PMC;
at91_set_a_periph(AT91_PIO_PORTC, 14, 1); /* TXD2 */
at91_set_a_periph(AT91_PIO_PORTC, 15, 0); /* RXD2 */
- writel(1 AT91SAM9261_ID_US2, pmc-pcer);
+ writel(1 ATMEL_ID_USART2, pmc-pcer);
}
-void at91_serial3_hw_init(void)
+void at91_seriald_hw_init(void)
{
- at91_pmc_t *pmc= (at91_pmc_t *) AT91_PMC_BASE;
+ at91_pmc_t *pmc= (at91_pmc_t *) ATMEL_BASE_PMC;
at91_set_a_periph(AT91_PIO_PORTA, 9, 0);/* DRXD */
at91_set_a_periph(AT91_PIO_PORTA, 10, 1); /* DTXD */
- writel(1 AT91_ID_SYS, pmc-pcer);
+ writel(1 ATMEL_ID_SYS, pmc-pcer);
}
void at91_serial_hw_init(void)
@@ -79,21 +80,21 @@ void at91_serial_hw_init(void)
#endif
#ifdef CONFIG_USART3 /* DBGU */
-
Re: [U-Boot] [PATCH 2/2] at91sam9261ek: make operational again
Hi, 2011/2/1 Reinhard Meyer u-b...@emk-elektronik.de: Dear all, /home/toolchain/bin/gcc-4.1.2-glibc-2.5-nptl-3/arm-none-linux-gnueabi/bin/arm-none-linux-gnueabi-ld -pie -r -o libat91.o lowlevel_init.o clock.o cpu.o reset.o timer.o /home/toolchain/bin/gcc-4.1.2-glibc-2.5-nptl-3/arm-none-linux-gnueabi/bin/arm-none-linux-gnueabi-ld: -r and -shared may not be used together I have tried this patch but this a problem releated to linking option. Do you have this problem? Michael Read up recent posts on the list: this was detected and is fixed in the master branch of the u-boot-arm repository. I'll rebase u-boot-atmel on u-boot-arm/master then. Please rebase at91 related patches on u-boot-atmel/rework then (my time permitting, that branch will exist somewhere tomorrow) I just posted a rework of these patch series, based on your latest rework branch It removes a lot of legacy code and makes the boards compile and operational again. It has been tested on real hardware. To make it easier for you: You can pull the series here or from the ML. :-)) - The following changes since commit 137f4defd8f8d8d2198b4981d25614a1cbcf4587: AT91: enable MMC on at91sam(9260/9g20/0xe)ek (2011-02-02 10:11:07 +0100) are available in the git repository at: git://git.denx.de/u-boot-usb.git fix-at91sam9261ek Remy Bohmer (2): at91sam9261ek: make operational again Make at91sam9261ek and at91sam9g10ek work on current u-boot-atmel.git Makefile | 23 --- arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c | 31 ++-- arch/arm/cpu/arm926ejs/at91/led.c |1 - arch/arm/include/asm/arch-at91/at91_matrix.h | 17 ++- arch/arm/include/asm/arch-at91/at91sam9261.h |1 + .../arm/include/asm/arch-at91/at91sam9261_matrix.h | 64 - board/atmel/at91sam9261ek/Makefile |6 +- board/atmel/at91sam9261ek/at91sam9261ek.c | 147 +++- board/atmel/at91sam9261ek/config.mk|1 - board/atmel/at91sam9261ek/led.c|8 +- boards.cfg |6 + doc/README.at91|3 +- include/configs/at91sam9261ek.h| 142 +++ 13 files changed, 201 insertions(+), 249 deletions(-) delete mode 100644 arch/arm/include/asm/arch-at91/at91sam9261_matrix.h delete mode 100644 board/atmel/at91sam9261ek/config.mk - Kind regards, Remy ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Pull request: u-boot-usb
The following changes since commit f69b980d108b5f15ca7dd3f4284d5a66488c3625: Merge branch 'master' of git://git.denx.de/u-boot-nand-flash (2011-02-04 21:44:46 +0100) are available in the git repository at: git://git.denx.de/u-boot-usb.git master Alexander Holler (2): USB: Fix device stati for removable and powerctrl (typo) USB: Change the necessary defines to get debug output common/usb.c |9 + 1 files changed, 5 insertions(+), 4 deletions(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] BeagleBoard-xM: Ethernet over USB supported ?
Hi, I am trying to enable boot from tftp for a BeagleBoard-xM. The BeagleBoard-xM has an integrated Ethernet port over USB. I have tried to enable it by adding these following lines in include/configs/omap3_beagle.h: #define CONFIG_USB_ETHER 1 #define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot*/ #define CONFIG_CMD_PING But when I compiled I have got a link error: /drivers/usb/gadget/libusb_gadget.o: In function `usb_eth_initialize': u-boot-main/drivers/usb/gadget/ether.c:1964: undefined reference to `usb_gadget_register_driver' drivers/usb/gadget/libusb_gadget.o: In function `usb_eth_init': u-boot-main/drivers/usb/gadget/ether.c:1812: undefined reference to `usb_gadget_handle_interrupts' The functions `usb_gadget_register_driver' and `usb_gadget_handle_interrupts' do not exist in the current u-boot tree... Can someone confirm we can or cannot use tftp with u-boot on the BeagleBoard ? Thanks, Olivier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 0/3] MIPS: Fix failed run of MAKEALL mips script
On 02/03/2011 10:17 PM, daniel.schwierz...@googlemail.com wrote: Currently MAKEALL mips covers 21 boards and 15 of them have compile errors with gcc-4.3.3. This patch series fixes these boards. Changes for v2: - make brace style consistent in vct.h - delete unused board/dbau1x00/flash.c All three patches applied, thanks. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] BeagleBoard-xM: Ethernet over USB supported ?
Hello, Am 05.02.2011 14:18, schrieb Olivier Martin: I am trying to enable boot from tftp for a BeagleBoard-xM. The BeagleBoard-xM has an integrated Ethernet port over USB. Currently there is no support for omap-ehci in u-boot. That means only the MUSB (OTG) USB port is usable. Regards, Alexander ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Move MIPS boards to boards.cfg
Along with applying Daniel's patches, I prepared these misc patches, trying to move all MIPS boards left in the top Makefile to boards.cfg. Compile tested using GCC4.4-based toolchain. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/5] cmd_ide: Fix an unused CONFIG_AU1X00 symbol to work as intended
commit 8bde63eb3f79d68f693201528dafc8ae7aa087de ([MIPS] Rename Alchemy processor configs into CONFIG_SOC_*) forgot to pick up this one. Signed-off-by: Shinya Kuribayashi skuri...@pobox.com --- common/cmd_ide.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/common/cmd_ide.c b/common/cmd_ide.c index df7bdf5..a1f7e57 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -811,7 +811,8 @@ set_pcmcia_timing (int pmode) /* We only need to swap data if we are running on a big endian cpu. */ /* But Au1x00 cpu:s already swaps data in big endian mode! */ -#if defined(__LITTLE_ENDIAN) || ( defined(CONFIG_AU1X00) !defined(CONFIG_GTH2) ) +#if defined(__LITTLE_ENDIAN) || \ + (defined(CONFIG_SOC_AU1X00) !defined(CONFIG_GTH2)) #define input_swap_data(x,y,z) input_data(x,y,z) #else static void -- 1.7.3.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-BOOT] [PATCH] env: reduce the stack footprint for the env buf
Dear Graeme Russ, In message 4d4d1987.5010...@gmail.com you wrote: Sounds like you have allocated too small a region for your stack - try increasing CONFIG_SYS_STACK_SIZE and decreasing CONFIG_SYS_MALLOC_LEN Most systems don't have anything like CONFIG_SYS_STACK_SIZE; the stack grows downward into free memory, and is only limited by the RAM size and the memory areas you might be using in RAM for example to load images or the like - the x86 implementation might be different, The only other thing I could think of that would make sense would be having the malloc heap in a completely different memory segment to the stack - odd, but possible But I doubt that would actually save memory either. 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 Do not underestimate the value of print statements for debugging. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/5] MIPS: Move Alchemy Au1x00 based boards to boards.cfg
CONFIG_GTH2 is already provided by configs/gth2.h, so we don't generate it using the options fields in boards.cfg. Signed-off-by: Shinya Kuribayashi skuri...@pobox.com --- Makefile | 39 --- boards.cfg |7 +++ 2 files changed, 7 insertions(+), 39 deletions(-) diff --git a/Makefile b/Makefile index 05b404d..e1f3b7f 100644 --- a/Makefile +++ b/Makefile @@ -1136,45 +1136,6 @@ vct_platinumavc_onenand_small_config: unconfig echo #define CONFIG_VCT_SMALL_IMAGE $(obj)include/config.h @$(MKCONFIG) -n $@ -a vct mips mips vct micronas -# -## MIPS32 AU1X00 -# - -dbau1000_config: unconfig - @mkdir -p $(obj)include - @echo #define CONFIG_DBAU1000 1 $(obj)include/config.h - @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00 - -dbau1100_config: unconfig - @mkdir -p $(obj)include - @echo #define CONFIG_DBAU1100 1 $(obj)include/config.h - @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00 - -dbau1500_config: unconfig - @mkdir -p $(obj)include - @echo #define CONFIG_DBAU1500 1 $(obj)include/config.h - @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00 - -dbau1550_config: unconfig - @mkdir -p $(obj)include - @echo #define CONFIG_DBAU1550 1 $(obj)include/config.h - @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00 - -dbau1550_el_config : unconfig - @mkdir -p $(obj)include - @echo #define CONFIG_DBAU1550 1 $(obj)include/config.h - @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00 - -gth2_config: unconfig - @mkdir -p $(obj)include - @echo #define CONFIG_GTH2 1 $(obj)include/config.h - @$(MKCONFIG) -a $@ mips mips gth2 - -pb1000_config : unconfig - @mkdir -p $(obj)include - @echo #define CONFIG_PB1000 1 $(obj)include/config.h - @$(MKCONFIG) -a pb1x00 mips mips pb1x00 - qemu_mips_config : unconfig @mkdir -p $(obj)include @echo #define CONFIG_QEMU_MIPS 1 $(obj)include/config.h diff --git a/boards.cfg b/boards.cfg index c977528..f1f2506 100644 --- a/boards.cfg +++ b/boards.cfg @@ -213,6 +213,13 @@ M5282EVB m68kmcf52x2 m5282evbfreesca M53017EVBm68kmcf52x2 m53017evb freescale EP2500 m68kmcf52x2 ep2500 Mercury microblaze-generic microblaze microblaze microblaze-generic xilinx +dbau1000 mipsmipsdbau1x00- - dbau1x00:DBAU1000 +dbau1100 mipsmipsdbau1x00- - dbau1x00:DBAU1100 +dbau1500 mipsmipsdbau1x00- - dbau1x00:DBAU1500 +dbau1550 mipsmipsdbau1x00- - dbau1x00:DBAU1550 +dbau1550_el mipsmipsdbau1x00- - dbau1x00:DBAU1550 +gth2 mipsmips +pb1000 mipsmipspb1x00 - - pb1x00:PB1000 purple mipsmips tb0229 mipsmips PCI5441 nios2 nios2 pci5441 psyent -- 1.7.3.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/5] MIPS: Move Qemu MIPS target to boards.cfg
CONFIG_QEMU_MIPS is already provided by configs/qemu-mips.h, so we don't generate it using the options fields in boards.cfg. Signed-off-by: Shinya Kuribayashi skuri...@pobox.com --- Makefile |5 - boards.cfg |1 + 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e1f3b7f..9e6cf25 100644 --- a/Makefile +++ b/Makefile @@ -1136,11 +1136,6 @@ vct_platinumavc_onenand_small_config: unconfig echo #define CONFIG_VCT_SMALL_IMAGE $(obj)include/config.h @$(MKCONFIG) -n $@ -a vct mips mips vct micronas -qemu_mips_config : unconfig - @mkdir -p $(obj)include - @echo #define CONFIG_QEMU_MIPS 1 $(obj)include/config.h - @$(MKCONFIG) -a qemu-mips mips mips qemu-mips - # # Nios # diff --git a/boards.cfg b/boards.cfg index f1f2506..cb67d2a 100644 --- a/boards.cfg +++ b/boards.cfg @@ -221,6 +221,7 @@ dbau1550_el mipsmips dbau1x00- gth2 mipsmips pb1000 mipsmipspb1x00 - - pb1x00:PB1000 purple mipsmips +qemu_mipsmipsmipsqemu-mips - - qemu-mips tb0229 mipsmips PCI5441 nios2 nios2 pci5441 psyent PK1C20 nios2 nios2 pk1c20 psyent -- 1.7.3.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 4/5] MIPS: Move Inca-IP targets to boards.cfg
At the same time, fix up CPU_CLOCK_RATE to have the CONFIG_ prefix to work with boards.cfg. Signed-off-by: Shinya Kuribayashi skuri...@pobox.com --- Makefile | 13 - board/incaip/lowlevel_init.S |2 +- boards.cfg |4 include/configs/incaip.h |9 ++--- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 9e6cf25..3fe0596 100644 --- a/Makefile +++ b/Makefile @@ -1098,19 +1098,6 @@ smdk6400_config : unconfig ## MIPS32 4Kc # -incaip_100MHz_config \ -incaip_133MHz_config \ -incaip_150MHz_config \ -incaip_config: unconfig - @mkdir -p $(obj)include - @[ -z $(findstring _100MHz,$@) ] || \ - echo #define CPU_CLOCK_RATE 1 $(obj)include/config.h - @[ -z $(findstring _133MHz,$@) ] || \ - echo #define CPU_CLOCK_RATE 13300 $(obj)include/config.h - @[ -z $(findstring _150MHz,$@) ] || \ - echo #define CPU_CLOCK_RATE 15000 $(obj)include/config.h - @$(MKCONFIG) -n $@ -a incaip mips mips incaip - vct_premium_config \ vct_premium_small_config \ vct_premium_onenand_config \ diff --git a/board/incaip/lowlevel_init.S b/board/incaip/lowlevel_init.S index fe525ec..b765795 100644 --- a/board/incaip/lowlevel_init.S +++ b/board/incaip/lowlevel_init.S @@ -283,7 +283,7 @@ lowlevel_init: /* EBU, CGU and SDRAM Initialization. */ - li a0, CPU_CLOCK_RATE + li a0, CONFIG_CPU_CLOCK_RATE movet0, ra /* We rely on the fact that neither ebu_init() nor cgu_init() nor sdram_init() diff --git a/boards.cfg b/boards.cfg index cb67d2a..d3edc9f 100644 --- a/boards.cfg +++ b/boards.cfg @@ -219,6 +219,10 @@ dbau1500 mipsmips dbau1x00- dbau1550 mipsmipsdbau1x00- - dbau1x00:DBAU1550 dbau1550_el mipsmipsdbau1x00- - dbau1x00:DBAU1550 gth2 mipsmips +incaip mipsmips +incaip_100MHzmipsmipsincaip - - incaip:CPU_CLOCK_RATE=1 +incaip_133MHzmipsmipsincaip - - incaip:CPU_CLOCK_RATE=13300 +incaip_150MHzmipsmipsincaip - - incaip:CPU_CLOCK_RATE=15000 pb1000 mipsmipspb1x00 - - pb1x00:PB1000 purple mipsmips qemu_mipsmipsmipsqemu-mips - - qemu-mips diff --git a/include/configs/incaip.h b/include/configs/incaip.h index b7ba6f4..f2950e8 100644 --- a/include/configs/incaip.h +++ b/include/configs/incaip.h @@ -31,9 +31,12 @@ #define CONFIG_MIPS32 1 /* MIPS 4Kc CPU core*/ #define CONFIG_INCA_IP 1 /* on a INCA-IP Board */ -#ifndefCPU_CLOCK_RATE -/* allowed values: 1, 13300, and 15000 */ -#define CPU_CLOCK_RATE 15000 /* default: 150 MHz clock for the MIPS core */ +/* + * Clock for the MIPS core (MHz) + * allowed values: 1, 13300, and 15000 (default) + */ +#ifndef CONFIG_CPU_CLOCK_RATE +#define CONFIG_CPU_CLOCK_RATE 15000 #endif #define INFINEON_EBU_BOOTCFG 0x40C4 /* CMULT = 8 */ -- 1.7.3.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 5/5] MIPS: Move VCT boards to boards.cfg
Signed-off-by: Shinya Kuribayashi skuri...@pobox.com --- Makefile | 32 boards.cfg | 12 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 3fe0596..6133160 100644 --- a/Makefile +++ b/Makefile @@ -1092,38 +1092,6 @@ smdk6400_config : unconfig @echo CONFIG_NAND_U_BOOT = y $(obj)include/config.mk # -# MIPS -# -# -## MIPS32 4Kc -# - -vct_premium_config \ -vct_premium_small_config \ -vct_premium_onenand_config \ -vct_premium_onenand_small_config \ -vct_platinum_config\ -vct_platinum_small_config \ -vct_platinum_onenand_config\ -vct_platinum_onenand_small_config \ -vct_platinumavc_config \ -vct_platinumavc_small_config \ -vct_platinumavc_onenand_config \ -vct_platinumavc_onenand_small_config: unconfig - @mkdir -p $(obj)include - @[ -z $(findstring _premium,$@) ] || \ - echo #define CONFIG_VCT_PREMIUM $(obj)include/config.h - @[ -z $(findstring _platinum_,$@) ] || \ - echo #define CONFIG_VCT_PLATINUM $(obj)include/config.h - @[ -z $(findstring _platinumavc,$@) ] || \ - echo #define CONFIG_VCT_PLATINUMAVC $(obj)include/config.h - @[ -z $(findstring _onenand,$@) ] || \ - echo #define CONFIG_VCT_ONENAND $(obj)include/config.h - @[ -z $(findstring _small,$@) ] || \ - echo #define CONFIG_VCT_SMALL_IMAGE $(obj)include/config.h - @$(MKCONFIG) -n $@ -a vct mips mips vct micronas - -# # Nios # diff --git a/boards.cfg b/boards.cfg index d3edc9f..b8369e1 100644 --- a/boards.cfg +++ b/boards.cfg @@ -227,6 +227,18 @@ pb1000 mipsmips pb1x00 - purple mipsmips qemu_mipsmipsmipsqemu-mips - - qemu-mips tb0229 mipsmips +vct_premium mipsmipsvct micronas - vct:VCT_PREMIUM +vct_premium_smallmipsmipsvct micronas - vct:VCT_PREMIUM,VCT_SMALL_IMAGE +vct_premium_onenand mipsmipsvct micronas - vct:VCT_PREMIUM,VCT_ONENAND +vct_premium_onenand_smallmipsmipsvct micronas - vct:VCT_PREMIUM,VCT_ONENAND,VCT_SMALL_IMAGE +vct_platinum mipsmipsvct micronas - vct:VCT_PLATINUM +vct_platinum_small mipsmipsvct micronas - vct:VCT_PLATINUM,VCT_SMALL_IMAGE +vct_platinum_onenand mipsmipsvct micronas - vct:VCT_PLATINUM,VCT_ONENAND +vct_platinum_onenand_small mipsmipsvct micronas - vct:VCT_PLATINUM,VCT_ONENAND,VCT_SMALL_IMAGE +vct_platinumavc mipsmipsvct micronas - vct:VCT_PLATINUMAVC +vct_platinumavc_smallmipsmipsvct micronas - vct:VCT_PLATINUMAVC,VCT_SMALL_IMAGE +vct_platinumavc_onenand mipsmipsvct micronas - vct:VCT_PLATINUMAVC,VCT_ONENAND +vct_platinumavc_onenand_small mips mipsvct micronas - vct:VCT_PLATINUMAVC,VCT_ONENAND,VCT_SMALL_IMAGE PCI5441 nios2 nios2 pci5441 psyent PK1C20 nios2 nios2 pk1c20 psyent EVB64260 powerpc 74xx_7xxevb64260- - EVB64260 -- 1.7.3.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/3] MIPS: Purple: Fix multiple definition error on final linking of u-boot binary
Dear Shinya Kuribayashi,
In message 4d4d3e6b.2040...@pobox.com you wrote:
--- a/board/purple/u-boot.lds
+++ b/board/purple/u-boot.lds
@@ -36,11 +36,6 @@ SECTIONS
{
arch/mips/cpu/start.o (.text)
board/purple/lowlevel_init.o (.text)
- arch/mips/cpu/cache.o (.text)
- common/main.o (.text)
- common/dlmalloc.o (.text)
- common/cmd_boot.o (.text)
- lib/zlib.o(.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.ppcenv)
This is ok, though we have some room for further cealnups. With having
.text statement in the lowlevel_init.S, we could remove all these lines.
The prupose of explicitly pulling in these objects at that place is to
fill in the first flash sector below the sector(s) that is/are
reserved for the environment (we call this setup embedded
environment).
But then, the Purple board has not been actively maintained for years,
and I guess we could as well remove it. At least I have not had
access to this board for several yars.
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 more complex the mind, the greater the need for the simplicity of
play.
-- Kirk, Shore Leave, stardate 3025.8
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 07/14] tsec: use IO accessories to access the register
On Jan 26, 2011, at 10:52 PM, Mingkai Hu wrote: Signed-off-by: Mingkai Hu mingkai...@freescale.com --- drivers/net/tsec.c | 232 ++- include/tsec.h |6 +- 2 files changed, 121 insertions(+), 117 deletions(-) applied to 85xx next - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 08/14] tsec: arrange the code to avoid useless function declaration
On Jan 26, 2011, at 10:52 PM, Mingkai Hu wrote: Signed-off-by: Mingkai Hu mingkai...@freescale.com --- drivers/net/tsec.c | 857 +--- 1 files changed, 416 insertions(+), 441 deletions(-) applied to 85xx next - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] {Spam?} u-boot-usb DFU working but need some ideas
Hi, I finally got things working well with my SAM9G45 USB devcie controller and continued to implement DFU for it. I implemented it using the new gadget layer and should be compatible with the at91_udc driver. I have managed to get DFU working in such way that it transfers the file to RAM. There's still a lot to do, but most things are in place and working well. Basically after transfer to RAM, a u-boot script can handle additional actions, so I'm in doubt about the following : The DFU implementation I used as a basis came from openmoko. This implements directly flashing the device. However, my thought is that it's much better to just write the file to RAM and let a script in u-boot handle what should happen with it (verify, boot, flash) The DFU spec seems to handle this with the bitManifestationTolentant bit, but the current dfu-utils don't use this bit (that can be updated of course, which I already did). About the way it currently works : 1) I start u-boot 2) I issue the dfuinit command (new) 3) the host can now download a file to RAM. Any thoughts on what would be the most preferred way to do this ? Additionally I think I will implement this as a composite driver so that both (usb)CDC and DFU are available via USB. I have both working, but currently must select it at compile time. My current implementation basically is just DFU as it assumes the application (not u-boot) to be the firmware to be updated, so no need to switch on descriptor layer level. Any reply on this would be nice, even if my above thoughts are in line. I hope to be able to post my changes in 1-2 weeks. After that my time is extremely limited due to long time travel. If anyone is interested in helping me out posting the changes it would be very much appreciated. Best regards, Marcel ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [GIT PULL] u-boot-mpc83xx - couple of minor fixes
Wolfgang Denk, Please pull a couple of minor fixes for 83xx: The following changes since commit f69b980d108b5f15ca7dd3f4284d5a66488c3625: Merge branch 'master' of git://git.denx.de/u-boot-nand-flash (2011-02-04 21:44:46 +0100) are available in the git repository at: git://git.denx.de/u-boot-mpc83xx.git master Joakim Tjernlund (1): mpc83xx: Use correct register to calculate clocks. Leo Liu (1): mpc83xx: fix pcie configuration space read/write arch/powerpc/cpu/mpc83xx/pcie.c | 19 ++- arch/powerpc/cpu/mpc83xx/speed.c | 15 --- include/mpc83xx.h|7 +++ include/pci.h|2 ++ 4 files changed, 35 insertions(+), 8 deletions(-) Thanks, Kim ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V4] mpc83xx:fix pcie configuration space read/write
On Wed, 19 Jan 2011 19:50:47 +0800
Leo Liu liucai@gmail.com wrote:
This patch fix a problem for the pcie enumeration when the mpc83xx pcie
controller is
connected with switch or we use both of the two pcie controller.
Signed-off-by: Leo Liu liucai@gmail.com
---
applied after fixing some comment format, and moving:
+/*private structure for mpc83xx pcie hose*/
+static struct mpc83xx_pcie_priv {
+ u8 index;
+} pcie_priv[PCIE_MAX_BUSES] = {
into a CONFIG_83XX_GENERIC_PCIE_REGISTER_HOSES protected area to avoid
a compiler warning: 'pcie_priv' defined but not used.
Thanks,
Kim
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mpc83xx: Use correct register to calculate clocks.
On Thu, 27 Jan 2011 16:30:54 +0100 Joakim Tjernlund joakim.tjernl...@transmode.se wrote: Use SPMR instead of HRCWL when calculating clocks as HCRWL may be changed and the CPU will not pick up all changes until there is a POR. u-boot will think SPMF has changed and get the clocks wrong. Signed-off-by: Joakim Tjernlund joakim.tjernl...@transmode.se --- applied, thanks. Kim ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
