diff mbox

[U-Boot,07/13] update/fix AcTux1 board

Message ID 1294062338-21084-8-git-send-email-michael@schwingen.org
State Superseded
Headers show

Commit Message

Michael Schwingen Jan. 3, 2011, 1:45 p.m. UTC 
Signed-off-by: Michael Schwingen <michael@schwingen.org>
---
 board/actux1/actux1.c    |   22 +++++++++++---------
 board/actux1/config.mk   |    7 +----
 board/actux1/u-boot.lds  |   42 +++++++++++++++++++++++++++------------
 boards.cfg               |    5 +++-
 include/configs/actux1.h |   48 +++++++++++++++++++++++++++------------------
 5 files changed, 76 insertions(+), 48 deletions(-)

Comments

Wolfgang Denk Jan. 25, 2011, 8:44 p.m. UTC | #1 
Dear Michael Schwingen,

In message <1294062338-21084-8-git-send-email-michael@schwingen.org> you wrote:
> 
> Signed-off-by: Michael Schwingen <michael@schwingen.org>
> ---
>  board/actux1/actux1.c    |   22 +++++++++++---------
>  board/actux1/config.mk   |    7 +----
>  board/actux1/u-boot.lds  |   42 +++++++++++++++++++++++++++------------
>  boards.cfg               |    5 +++-
>  include/configs/actux1.h |   48 +++++++++++++++++++++++++++------------------
>  5 files changed, 76 insertions(+), 48 deletions(-)
> 
> diff --git a/board/actux1/actux1.c b/board/actux1/actux1.c
> index 399be23..c56ec94 100644
> --- a/board/actux1/actux1.c
> +++ b/board/actux1/actux1.c
> @@ -42,6 +42,17 @@
>  
>  DECLARE_GLOBAL_DATA_PTR;
>  
> +int board_early_init_f (void)
> +{
> +	/* CS5: Debug port */
> +	*IXP425_EXP_CS5 = 0x9d520003;
> +	/* CS6: HwRel */
> +	*IXP425_EXP_CS6 = 0x81860001;
> +	/* CS7: LEDs */
> +	*IXP425_EXP_CS7 = 0x80900003;
> +	return 0;

Please always use I/O accessors.  Please fix globally.

>  int dram_init (void)
>  {
> -	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
> -	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
> -
> +	gd->ram_size = PHYS_SDRAM_1_SIZE;
>  	return (0);

You should use get_ram_size() here.

> diff --git a/board/actux1/config.mk b/board/actux1/config.mk
> index 88634f7..a370337 100644
> --- a/board/actux1/config.mk
> +++ b/board/actux1/config.mk
> @@ -1,6 +1,3 @@
> -CONFIG_SYS_TEXT_BASE = 0x00e00000
> -
> -# include NPE ethernet driver
> -BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.o
> -
>  LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
> +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
> +PLATFORM_LDFLAGS += --gc-sections

Can we please get rid of this file completely?

Best regards,

Wolfgang Denk
Michael Schwingen Jan. 25, 2011, 11:37 p.m. UTC | #2 
Am 01/25/2011 09:44 PM, schrieb Wolfgang Denk:
>
>> diff --git a/board/actux1/config.mk b/board/actux1/config.mk
>> index 88634f7..a370337 100644
>> --- a/board/actux1/config.mk
>> +++ b/board/actux1/config.mk
>> @@ -1,6 +1,3 @@
>> -CONFIG_SYS_TEXT_BASE = 0x00e00000
>> -
>> -# include NPE ethernet driver
>> -BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.o
>> -
>>  LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
>> +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
>> +PLATFORM_LDFLAGS += --gc-sections
> Can we please get rid of this file completely?
If you have a better proposal where to add -ffunction-sections and
--gc-sections?

In my previous patch, I proposed a generic config switch (which added
those flags in the generic Makefile) for that, but the only comment I
got was from Mike Frysinger, stating that an extra config switch was
unnecessary when I could simply set those variables in the board config.mk.

Those two switches make for a significant reduction in code size (~61000
bytes, nearly one flash sector!), so dropping them is no real option.

Which solution would you prefer?

cu
Michael
Wolfgang Denk Jan. 26, 2011, 7:26 a.m. UTC | #3 
Dear Michael Schwingen,

In message <4D3F5EAC.9000002@discworld.dascon.de> you wrote:
> Am 01/25/2011 09:44 PM, schrieb Wolfgang Denk:
> >
> >> diff --git a/board/actux1/config.mk b/board/actux1/config.mk
> >> index 88634f7..a370337 100644
> >> --- a/board/actux1/config.mk
> >> +++ b/board/actux1/config.mk
> >> @@ -1,6 +1,3 @@
> >> -CONFIG_SYS_TEXT_BASE = 0x00e00000
> >> -
> >> -# include NPE ethernet driver
> >> -BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.o
> >> -
> >>  LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
> >> +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
> >> +PLATFORM_LDFLAGS += --gc-sections
> > Can we please get rid of this file completely?
> If you have a better proposal where to add -ffunction-sections and
> --gc-sections?

These should go to arch/arm/config.mk or at least arch/arm/cpu/*/config.mk

It makes little sense to enable this on a per board level.


Best regards,

Wolfgang Denk
Michael Schwingen Jan. 29, 2011, 3:57 p.m. UTC | #4 
Am 01/25/2011 09:44 PM, schrieb Wolfgang Denk:
>
>> diff --git a/board/actux1/config.mk b/board/actux1/config.mk
>> index 88634f7..a370337 100644
>> --- a/board/actux1/config.mk
>> +++ b/board/actux1/config.mk
>> @@ -1,6 +1,3 @@
>> -CONFIG_SYS_TEXT_BASE = 0x00e00000
>> -
>> -# include NPE ethernet driver
>> -BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.o
>> -
>>  LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
>> +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
>> +PLATFORM_LDFLAGS += --gc-sections
> Can we please get rid of this file completely?
>
I got out everything except the LDSCRIPT definition. However, I can't
find a way to specify a board-specific linker script (which I need due
to the embedded environment) without using config.mk in the board
directory, since the platform sets up a non-board default in
arch/arm/config.mk.

How about a
#define CONFIG_BOARD_LDSCRIPT
that is picked up by autoconf.mk and used in the Makefiles if set?

cu
Michael
Scott Wood Jan. 31, 2011, 7:01 p.m. UTC | #5 
On Sat, 29 Jan 2011 16:57:07 +0100
Michael Schwingen <rincewind@discworld.dascon.de> wrote:

> Am 01/25/2011 09:44 PM, schrieb Wolfgang Denk:
> >
> >> diff --git a/board/actux1/config.mk b/board/actux1/config.mk
> >> index 88634f7..a370337 100644
> >> --- a/board/actux1/config.mk
> >> +++ b/board/actux1/config.mk
> >> @@ -1,6 +1,3 @@
> >> -CONFIG_SYS_TEXT_BASE = 0x00e00000
> >> -
> >> -# include NPE ethernet driver
> >> -BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.o
> >> -
> >>  LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
> >> +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
> >> +PLATFORM_LDFLAGS += --gc-sections
> > Can we please get rid of this file completely?
> >
> I got out everything except the LDSCRIPT definition. However, I can't
> find a way to specify a board-specific linker script (which I need due
> to the embedded environment) without using config.mk in the board
> directory, since the platform sets up a non-board default in
> arch/arm/config.mk.
> 
> How about a
> #define CONFIG_BOARD_LDSCRIPT
> that is picked up by autoconf.mk and used in the Makefiles if set?

PowerPC uses CONFIG_SYS_LDSCRIPT for this.

-Scott
Michael Schwingen Jan. 31, 2011, 7:20 p.m. UTC | #6 
Am 01/31/2011 08:01 PM, schrieb Scott Wood:
>>
>> I got out everything except the LDSCRIPT definition. However, I can't
>> find a way to specify a board-specific linker script (which I need due
>> to the embedded environment) without using config.mk in the board
>> directory, since the platform sets up a non-board default in
>> arch/arm/config.mk.
>>
>> How about a
>> #define CONFIG_BOARD_LDSCRIPT
>> that is picked up by autoconf.mk and used in the Makefiles if set?
> PowerPC uses CONFIG_SYS_LDSCRIPT for this.
Thanks, found it - I had only searched non-architecture Makefiles.
I can copy that mechanism to ARM.

cu
Michael
diff mbox

Patch

diff --git a/board/actux1/actux1.c b/board/actux1/actux1.c
index 399be23..c56ec94 100644
--- a/board/actux1/actux1.c
+++ b/board/actux1/actux1.c
@@ -42,6 +42,17 @@ 
 
 DECLARE_GLOBAL_DATA_PTR;
 
+int board_early_init_f (void)
+{
+	/* CS5: Debug port */
+	*IXP425_EXP_CS5 = 0x9d520003;
+	/* CS6: HwRel */
+	*IXP425_EXP_CS6 = 0x81860001;
+	/* CS7: LEDs */
+	*IXP425_EXP_CS7 = 0x80900003;
+	return 0;
+}
+
 int board_init (void)
 {
 	gd->bd->bi_arch_number = MACH_TYPE_ACTUX1;
@@ -61,13 +72,6 @@  int board_init (void)
 	GPIO_OUTPUT_ENABLE (CONFIG_SYS_GPIO_EXTBUS_CLK);
 	*IXP425_GPIO_GPCLKR = 0x011001FF;
 
-	/* CS5: Debug port */
-	*IXP425_EXP_CS5 = 0x9d520003;
-	/* CS6: HwRel */
-	*IXP425_EXP_CS6 = 0x81860001;
-	/* CS7: LEDs */
-	*IXP425_EXP_CS7 = 0x80900003;
-
 	udelay (533);
 	GPIO_OUTPUT_SET (CONFIG_SYS_GPIO_IORST);
 
@@ -116,9 +120,7 @@  u32 get_board_rev (void)
 
 int dram_init (void)
 {
-	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-
+	gd->ram_size = PHYS_SDRAM_1_SIZE;
 	return (0);
 }
 
diff --git a/board/actux1/config.mk b/board/actux1/config.mk
index 88634f7..a370337 100644
--- a/board/actux1/config.mk
+++ b/board/actux1/config.mk
@@ -1,6 +1,3 @@ 
-CONFIG_SYS_TEXT_BASE = 0x00e00000
-
-# include NPE ethernet driver
-BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.o
-
 LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
+PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
+PLATFORM_LDFLAGS += --gc-sections
diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
index 5c1ece7..6809ef7 100644
--- a/board/actux1/u-boot.lds
+++ b/board/actux1/u-boot.lds
@@ -30,15 +30,15 @@  SECTIONS
 
 	. = ALIGN (4);
 	.text : {
-		arch/arm/cpu/ixp/start.o(.text)
-		lib/string.o(.text)
-		lib/vsprintf.o(.text)
-		arch/arm/lib/board.o(.text)
-		common/dlmalloc.o(.text)
-		arch/arm/cpu/ixp/cpu.o(.text)
+		arch/arm/cpu/ixp/start.o(.text*)
+		net/libnet.o(.text*)
+		board/actux1/libactux1.o(.text*)
+		arch/arm/cpu/ixp/libixp.o(.text*)
+		drivers/serial/libserial.o(.text*)
+
 		. = env_offset;
 		common/env_embedded.o(.ppcenv)
-		* (.text)
+		*(.text*)
 	}
 
 	. = ALIGN (4);
@@ -47,7 +47,7 @@  SECTIONS
 	}
 	. = ALIGN (4);
 	.data : {
-		*(.data)
+		*(.data*)
 	}
 	. = ALIGN (4);
 	.got : {
@@ -61,10 +61,26 @@  SECTIONS
 	__u_boot_cmd_end =.;
 
 	. = ALIGN (4);
-	__bss_start =.;
-	.bss (NOLOAD): {
-		*(.bss)
-		. = ALIGN(4);
+	.rel.dyn : {
+		__rel_dyn_start = .;
+		*(.rel*)
+		__rel_dyn_end = .;
+	}
+
+	.dynsym : {
+		__dynsym_start = .;
+		*(.dynsym)
+	}
+
+	.bss __rel_dyn_start (OVERLAY) : {
+		__bss_start = .;
+		*(.bss*)
+		 . = ALIGN(4);
+		_end = .;
 	}
-	_end =.;
+	/DISCARD/ : { *(.dynstr*) }
+	/DISCARD/ : { *(.dynamic*) }
+	/DISCARD/ : { *(.plt*) }
+	/DISCARD/ : { *(.interp*) }
+	/DISCARD/ : { *(.gnu*) }
 }
diff --git a/boards.cfg b/boards.cfg
index 94b8745..695baca 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -122,7 +122,10 @@  omap4_panda                  arm         armv7       panda               ti
 omap4_sdp4430                arm         armv7       sdp4430             ti             omap4
 s5p_goni                     arm         armv7       goni                samsung        s5pc1xx
 smdkc100                     arm         armv7       smdkc100            samsung        s5pc1xx
-actux1                       arm         ixp
+actux1_4_16                  arm         ixp         actux1              -              -           actux1:FLASH2X2
+actux1_8_16                  arm         ixp         actux1              -              -           actux1:FLASH1X8
+actux1_4_32                  arm         ixp         actux1              -              -           actux1:FLASH2X2,RAM_32MB
+actux1_8_32                  arm         ixp         actux1              -              -           actux1:FLASH1X8,RAM_32MB
 actux2                       arm         ixp
 actux3                       arm         ixp
 actux4                       arm         ixp
diff --git a/include/configs/actux1.h b/include/configs/actux1.h
index 8886eff..2ffedf1 100644
--- a/include/configs/actux1.h
+++ b/include/configs/actux1.h
@@ -26,13 +26,6 @@ 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/* 1: modified board with 32MB DRAM */
-#define CONFIG_ACTUX1_32MB		0
-/* 1: 2*2MB FLASH (standard) */
-#define CONFIG_ACTUX1_FLASH2X2		1
-/* 1: 1*8MB FLASH (upgraded boards) */
-#define CONFIG_ACTUX1_FLASH1X8		0
-
 #define CONFIG_IXP425			1
 #define CONFIG_ACTUX1			1
 
@@ -44,6 +37,7 @@ 
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_BOOTDELAY		3
 #define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */
+#define CONFIG_BOARD_EARLY_INIT_F	1
 
 /***************************************************************
  * U-boot generic defines start here.
@@ -54,7 +48,6 @@ 
  * Size of malloc() pool
  */
 #define CONFIG_SYS_MALLOC_LEN			(CONFIG_ENV_SIZE + 128*1024)
-/* size in bytes reserved for initial data */
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
@@ -63,8 +56,8 @@ 
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_ELF
-#undef CONFIG_CMD_PCI
-#undef CONFIG_PCI
+//!#undef CONFIG_CMD_PCI
+//!#undef CONFIG_PCI
 
 #define CONFIG_BOOTCOMMAND		"run boot_flash"
 /* enable passing of ATAGs */
@@ -94,8 +87,9 @@ 
 #define CONFIG_SYS_MEMTEST_START		0x00400000
 #define CONFIG_SYS_MEMTEST_END			0x00800000
 
-/* spec says 66.666 MHz, but it appears to be 33 */
-#define CONFIG_SYS_HZ				3333333
+/* timer clock - 2* OSC_IN system clock */
+#define CONFIG_IXP425_TIMER_CLK                 66666666
+#define CONFIG_SYS_HZ				1000
 
 /* default load address */
 #define CONFIG_SYS_LOAD_ADDR			0x00010000
@@ -121,9 +115,9 @@ 
 /* SDRAM settings */
 #define CONFIG_NR_DRAM_BANKS		1
 #define PHYS_SDRAM_1			0x00000000
-#define CONFIG_SYS_DRAM_BASE			0x00000000
+#define CONFIG_SYS_SDRAM_BASE			0x00000000
 
-#if CONFIG_ACTUX1_32MB
+#ifdef CONFIG_RAM_32MB
 # define CONFIG_SYS_SDR_CONFIG			0x18
 # define PHYS_SDRAM_1_SIZE		0x02000000
 # define CONFIG_SYS_SDRAM_REFRESH_CNT		0x81a
@@ -137,8 +131,11 @@ 
 # define CONFIG_SYS_DRAM_SIZE			0x01000000
 #endif
 
+
+
 /* FLASH organization */
-#if CONFIG_ACTUX1_FLASH2X2
+#define CONFIG_SYS_TEXT_BASE		0x50000000
+#ifdef CONFIG_FLASH2X2
 # define CONFIG_SYS_MAX_FLASH_BANKS		2
 /* max number of sectors on one chip */
 # define CONFIG_SYS_MAX_FLASH_SECT		40
@@ -146,7 +143,7 @@ 
 # define PHYS_FLASH_2			0x50200000
 # define CONFIG_SYS_FLASH_BANKS_LIST		{ PHYS_FLASH_1, PHYS_FLASH_2 }
 #endif
-#if CONFIG_ACTUX1_FLASH1X8
+#ifdef CONFIG_FLASH1X8
 # define CONFIG_SYS_MAX_FLASH_BANKS		1
 /* max number of sectors on one chip */
 # define CONFIG_SYS_MAX_FLASH_SECT		140
@@ -173,12 +170,16 @@ 
 #define CONFIG_NET_MULTI		1
 /* NPE0 PHY address */
 #define	CONFIG_PHY_ADDR			0
+/* NPE1 PHY address (HW Release E only) */
+#define	CONFIG_PHY1_ADDR		1
 /* MII PHY management */
 #define CONFIG_MII			1
 /* Number of ethernet rx buffers & descriptors */
 #define CONFIG_SYS_RX_ETH_BUFFER		16
 #define CONFIG_RESET_PHY_R		1
 
+#define CONFIG_HAS_ETH1			1
+
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_MII
@@ -203,17 +204,19 @@ 
 #define CONFIG_ENV_ADDR			(PHYS_FLASH_1 + 0x4000)
 #define CONFIG_SYS_USE_PPCENV			1
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CONFIG_EXTRA_ENV_SETTINGS					\
 	"npe_ucode=50040000\0"						\
 	"mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \
 	"kerneladdr=50050000\0"						\
+	"kernelfile=actux1/uImage\0"					\
+	"rootfile=actux1/rootfs\0"					\
 	"rootaddr=50170000\0"						\
 	"loadaddr=10000\0"						\
 	"updateboot_ser=mw.b 10000 ff 40000;"				\
 	" loady ${loadaddr};"						\
 	" run eraseboot writeboot\0"					\
 	"updateboot_net=mw.b 10000 ff 40000;"				\
-	" tftp ${loadaddr} u-boot.bin;"					\
+	" tftp ${loadaddr} actux1/u-boot.bin;"				\
 	" run eraseboot writeboot\0"					\
 	"eraseboot=protect off 50000000 50003fff;"			\
 	" protect off 50006000 5003ffff;"				\
@@ -223,6 +226,9 @@ 
 	" cp.b 16000 50006000 3a000\0"					\
 	"eraseenv=protect off 50004000 50005fff;"			\
 	" erase 50004000 50005fff\0"					\
+	"updateucode=loady;"						\
+	" era ${npe_ucode} +${filesize};"				\
+	" cp.b ${loadaddr} ${npe_ucode} ${filesize}\0"			\
 	"updateroot=tftp ${loadaddr} ${rootfile};"			\
 	" era ${rootaddr} +${filesize};"				\
 	" cp.b ${loadaddr} ${rootaddr} ${filesize}\0"			\
@@ -233,7 +239,7 @@ 
 	" rootfstype=squashfs,jffs2 init=/etc/preinit\0"		\
 	"netargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock3"	\
 	" rootfstype=squashfs,jffs2 init=/etc/preinit\0"		\
-	"addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0" \
+	"addtty=setenv bootargs ${bootargs} console=ttyS1,${baudrate}\0" \
 	"addeth=setenv bootargs ${bootargs} ethaddr=${ethaddr}\0"	\
 	"boot_flash=run flashargs addtty addeth;"			\
 	" bootm ${kerneladdr}\0"					\
@@ -241,4 +247,8 @@ 
 	" tftpboot ${loadaddr} ${kernelfile};"				\
 	" bootm\0"
 
+/* additions for new relocation code, must be added to all boards */
+#define CONFIG_SYS_INIT_SP_ADDR        \
+	(CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE)
+
 #endif /* __CONFIG_H */