IXP42x patch series
Hi,
here is my IXP42x patch series, which brings my IXP boards back to life after relocation was added.
Some comments:
I added the XScale sub-architecture to the MAINTAINERS list to get a better overview which boards may still need work:
[PATCH 01/13] add XScale sub architecture (IXP/PXA) to board list
The NPE library needs a fix for B1 silicon - the special handling is only needed for Rev. A0, but the code treats everything *but* B0 as being the old A0 silicon:
[PATCH 02/13] add support for IXP42x Rev. B1 and newer
The dvlhost board has a watchdog that needs to be triggered regularly:
[PATCH 03/13] trigger hardware watchdog in IXP42x serial driver
Rework the startup and timer code:
[PATCH 04/13] Fix IXP code to work after relocation was added:
make fails during depend pass in the NPE directory, due to missing include files:
[PATCH 05/13] fix "depend" target in npe directory
Board updates:
[PATCH 06/13] update/fix AcTux1 board
[PATCH 07/13] update/fix AcTux2 board
[PATCH 08/13] update/fix AcTux3 board
[PATCH 09/13] update/fix AcTux4 board
These fixes should be OK (not sure about the environment location on IXDP425
- the old value is inside the monitor area, which seems to be wrong). I do not know if these should be committed, or should be left for the board maintainers:
[PATCH 10/13] update/fix some more IXP42x boards (only compile tested)
Add one new board:
[PATCH 11/13] add dvlhost (dLAN 200 AV Wireless G) board
Add support for -ffunction-sections / --gc-sections. This cuts the size of u-boot.bin from 288548 bytes down to 226820 bytes on AcTux-3, probably in part due to unused code in the Intel NPE library. I found no way to implement this in board-specific parts, so I added a global option to enable this:
[PATCH 12/13] add support for function-sections
Add support for MII links that run at fixed speed, without a PHY with standard registers (ethernet switch on AcTux-2/AcTux-3, powerline modem on dvlhost):
[PATCH 13/13] add support for fixed-speed MII ports (no standard PHY registers)
cu
Michael
PATCH 1/13 add XScale sub architecture (IXP/PXA) to board list
--- MAINTAINERS | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-)
MAINTAINERS +23 -23
@@ -552,8 +552,8 @@ Rowel Atienza <[email protected]> Stefano Babic <[email protected]> ea20 davinci - polaris xscale - trizepsiv xscale + polaris xscale/pxa + trizepsiv xscale/pxa mx51evk i.MX51 vision2 i.MX51
@@ -582,7 +582,7 @@ Andreas Bie Cliff Brake <[email protected]> - pxa255_idp xscale + pxa255_idp xscale/pxa Rick Bronson <[email protected]>
@@ -619,7 +619,7 @@ Fabio Estevam <[email protected]> Peter Figuli <[email protected]> - wepep250 xscale + wepep250 xscale/pxa (removed) Daniel Gorsulowski <[email protected]>
@@ -687,7 +687,7 @@ Sergey Kubushyn <[email protected]> Prakash Kumar <[email protected]> - cerf250 xscale + cerf250 xscale/pxa Vipin Kumar <[email protected]>
@@ -761,9 +761,9 @@ John Rigby <[email protected]> Stefan Roese <[email protected]> - ixdpg425 xscale - pdnb3 xscale - scpu xscale + ixdpg425 xscale/ixp + pdnb3 xscale/ixp + scpu xscale/ixp Alessandro Rubini <[email protected]> Nomadik Linux Team <[email protected]>
@@ -786,15 +786,15 @@ Heiko Schocher <[email protected]> Robert Schwebel <[email protected]> - csb226 xscale - innokom xscale + csb226 xscale/pxa + innokom xscale/pxa Michael Schwingen <[email protected]> - actux1 xscale - actux2 xscale - actux3 xscale - actux4 xscale + actux1 xscale/ixp + actux2 xscale/ixp + actux3 xscale/ixp + actux4 xscale/ixp Andrea Scian <[email protected]>
@@ -818,12 +818,12 @@ Greg Ungerer <[email protected]> Marek Vasut <[email protected]> - balloon3 xscale - colibri_pxa270 xscale - palmld xscale - palmtc xscale - vpac270 xscale - zipitz2 xscale + balloon3 xscale/pxa + colibri_pxa270 xscale/pxa + palmld xscale/pxa + palmtc xscale/pxa + vpac270 xscale/pxa + zipitz2 xscale/pxa Hugo Villeneuve <[email protected]>
@@ -864,9 +864,9 @@ Sughosh Ganu <[email protected]> Unknown / orphaned boards: Board CPU Last known maintainer / Comment ......................................................................... - cradle xscale Kyle Harris <[email protected]> / dead address - ixdp425 xscale Kyle Harris <[email protected]> / dead address - lubbock xscale Kyle Harris <[email protected]> / dead address + cradle xscale/pxa Kyle Harris <[email protected]> / dead address + ixdp425 xscale/ixp Kyle Harris <[email protected]> / dead address + lubbock xscale/pxa Kyle Harris <[email protected]> / dead address imx31_phycore_eet i.MX31 Guennadi Liakhovetski <[email protected]> / resigned mx31ads i.MX31 Guennadi Liakhovetski <[email protected]> / resigned
Signature · 1 line
1.7.2.3
PATCH 2/13 add support for IXP42x Rev. B1 and newer
In reply to Michael Schwingen--- arch/arm/cpu/ixp/npe/npe.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/arm/cpu/ixp/npe/npe.c +2 -1
@@ -621,8 +621,9 @@ int npe_initialize(bd_t * bis)if (ixFeatureCtrlDeviceRead () ==IX_FEATURE_CTRL_DEVICE_TYPE_IXP42X ) {switch (ixFeatureCtrlProductIdRead () &IX_FEATURE_CTRL_SILICON_STEPPING_MASK ) {case IX_FEATURE_CTRL_SILICON_TYPE_B0 : +default :/* newer than B0 */ /* -* If it is B0 Silicon, we only enable port when its corresponding +* If it is B0 or newer Silicon, we only enable port when its corresponding * Eth Coprocessor is available. */ if (ixFeatureCtrlComponentCheck(IX_FEATURECTRL_ETH0) ==
Signature · 1 line
1.7.2.3
PATCH 3/13 trigger hardware watchdog in IXP42x serial driver
In reply to Michael Schwingen--- drivers/serial/serial_ixp.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/serial/serial_ixp.c +5 -2
@@ -30,6 +30,7 @@#include <common.h> #include <asm/arch/ixp425.h> +#include <watchdog.h> /* * 14.7456 MHz
@@ -85,7 +86,8 @@ int serial_init (void)void serial_putc (const char c) {/* wait for room in the tx FIFO on UART */ -while ((LSR (CONFIG_SYS_IXP425_CONSOLE ) &LSR_TEMT ) ==0 ); +while ((LSR (CONFIG_SYS_IXP425_CONSOLE ) &LSR_TEMT ) ==0 ) +WATCHDOG_RESET ();/* Reset HW Watchdog, if needed */ THR (CONFIG_SYS_IXP425_CONSOLE ) = c;
@@ -111,7 +113,8 @@ int serial_tstc (void)*/ int serial_getc (void ) { -while (!(LSR (CONFIG_SYS_IXP425_CONSOLE ) &LSR_DR )); +while (!(LSR (CONFIG_SYS_IXP425_CONSOLE ) &LSR_DR )) +WATCHDOG_RESET ();/* Reset HW Watchdog, if needed */ return (char )RBR (CONFIG_SYS_IXP425_CONSOLE ) &0xff ; }
Signature · 1 line
1.7.2.3
PATCH 4/13 Fix IXP code to work after relocation was added: - jump to real flash location after reset before turning off flash mirror - fix timer system to use HZ == 1000, remove broken interrupt-based code
In reply to Michael Schwingen--- arch/arm/cpu/ixp/cpu.c | 5 -- arch/arm/cpu/ixp/start.S | 59 ++-------------- arch/arm/cpu/ixp/timer.c | 125 +++++++++++++++----------------- arch/arm/include/asm/arch-ixp/ixp425.h | 5 +- 4 files changed, 66 insertions(+), 128 deletions(-)
arch/arm/cpu/ixp/cpu.c +0 -5
@@ -36,8 +36,6 @@#include <asm/arch/ixp425.h> #include <asm/system.h> -ulong loops_per_jiffy; -static void cache_flush (void );#if defined(CONFIG_DISPLAY_CPUINFO )
@@ -51,17 +49,14 @@ int print_cpuinfo (void)puts ("CPU: Intel IXP425 at " );switch ((id &0x000003f0 ) >>4 ) {case 0x1c : - loops_per_jiffy =887467 ; speed =533 ;break ;case 0x1d : - loops_per_jiffy =666016 ; speed =400 ;break ;case 0x1f : - loops_per_jiffy =442901 ; speed =266 ;break ; }
arch/arm/cpu/ixp/start.S +5 -54
103 lines not on this page · raw message
arch/arm/cpu/ixp/timer.c +59 -66
168 lines not on this page · raw message
arch/arm/include/asm/arch-ixp/ixp425.h +2 -3
@@ -391,9 +391,8 @@#define IXP425_TIMER_REG (x) (IXP425_TIMER_BASE_PHYS+(x))#endif -#if 0 /* test-only: also defined in npe/include/... */ -#define IXP425_OSTS IXP425_TIMER_REG(IXP425_OSTS_OFFSET) -#endif +/* _B to avoid collision: also defined in npe/include/... */ +#define IXP425_OSTS_B IXP425_TIMER_REG(IXP425_OSTS_OFFSET)#define IXP425_OST1 IXP425_TIMER_REG(IXP425_OST1_OFFSET)#define IXP425_OSRT1 IXP425_TIMER_REG(IXP425_OSRT1_OFFSET)#define IXP425_OST2 IXP425_TIMER_REG(IXP425_OST2_OFFSET)
Signature · 1 line
1.7.2.3
PATCH 4/13 Fix IXP code to work after relocation was added: - jump to real flash location after reset before turning off flash mirror - fix timer system to use HZ == 1000, remove broken interrupt-based code
your patch summary is way too long
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20101228/7df915f8/attachment.pgp
PATCH 5/13 fix "depend" target in npe directory
In reply to Michael Schwingen--- arch/arm/cpu/ixp/npe/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/cpu/ixp/npe/Makefile +1 -0
@@ -27,6 +27,7 @@ LIB := $(obj)libnpe.o LOCAL_CFLAGS += -I$(TOPDIR)/arch/arm/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux CFLAGS += $(LOCAL_CFLAGS) +CPPFLAGS += $(LOCAL_CFLAGS) # needed for depend HOSTCFLAGS += $(LOCAL_CFLAGS) COBJS-$(CONFIG_IXP4XX_NPE) := npe.o \
Signature · 1 line
1.7.2.3
PATCH 6/13 update/fix AcTux1 board
In reply to Michael Schwingen--- board/actux1/actux1.c | 22 +++++++++++--------- board/actux1/config.mk | 2 - board/actux1/u-boot.lds | 40 ++++++++++++++++++++++++++----------- boards.cfg | 5 +++- include/configs/actux1.h | 48 +++++++++++++++++++++++++++------------------ 5 files changed, 73 insertions(+), 44 deletions(-)
board/actux1/actux1.c +12 -10
@@ -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 ); }
board/actux1/config.mk +0 -2
@@ -1,5 +1,3 @@ -CONFIG_SYS_TEXT_BASE = 0x00e00000 - # include NPE ethernet driver BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.o
board/actux1/u-boot.lds +28 -12
@@ -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): { + .rel.dyn : { + __rel_dyn_start = .; + *(.rel*) + __rel_dyn_end = .; + } + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + } + + .bss __rel_dyn_start (OVERLAY) : { + __bss_start = .; *(.bss) - . = ALIGN(4); + . = ALIGN(4); + _end = .; } - _end =.; + /DISCARD/ : { *(.dynstr*) } + /DISCARD/ : { *(.dynamic*) } + /DISCARD/ : { *(.plt*) } + /DISCARD/ : { *(.interp*) } + /DISCARD/ : { *(.gnu*) } }
boards.cfg +4 -1
@@ -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
include/configs/actux1.h +29 -19
141 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH 7/13 update/fix AcTux2 board
In reply to Michael Schwingen--- board/actux2/actux2.c | 26 ++++++++++++++------------ board/actux2/config.mk | 2 -- board/actux2/u-boot.lds | 45 ++++++++++++++++++++++++++++----------------- include/configs/actux2.h | 21 ++++++++++++++++----- 4 files changed, 58 insertions(+), 36 deletions(-)
board/actux2/actux2.c +14 -12
@@ -43,6 +43,19 @@DECLARE_GLOBAL_DATA_PTR ; +int board_early_init_f (void ) +{ +/* CS1: IPAC-X */ + *IXP425_EXP_CS1 =0x94d10013 ; +/* CS5: Debug port */ + *IXP425_EXP_CS5 =0x9d520003 ; +/* CS6: HW release register */ + *IXP425_EXP_CS6 =0x81860001 ; +/* CS7: LEDs */ + *IXP425_EXP_CS7 =0x80900003 ; +return 0 ; +} +int board_init (void ) { gd->bd->bi_arch_number =MACH_TYPE_ACTUX2 ;
@@ -70,15 +83,6 @@ int board_init (void)GPIO_OUTPUT_ENABLE (CONFIG_SYS_GPIO_EXTBUS_CLK ); *IXP425_GPIO_GPCLKR =0x011001FF ; -/* CS1: IPAC-X */ - *IXP425_EXP_CS1 =0x94d10013 ; -/* CS5: Debug port */ - *IXP425_EXP_CS5 =0x9d520003 ; -/* CS6: HW release register */ - *IXP425_EXP_CS6 =0x81860001 ; -/* CS7: LEDs */ - *IXP425_EXP_CS7 =0x80900003 ; -udelay (533 );GPIO_OUTPUT_SET (CONFIG_SYS_GPIO_IORST );GPIO_OUTPUT_SET (CONFIG_SYS_GPIO_ETHRST );
@@ -112,9 +116,7 @@ int checkboard (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 ); }
board/actux2/config.mk +0 -2
@@ -1,5 +1,3 @@ -CONFIG_SYS_TEXT_BASE = 0x00e00000 - # include NPE ethernet driver BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.o
board/actux2/u-boot.lds +28 -17
72 lines not on this page · raw message
include/configs/actux2.h +16 -5
@@ -37,6 +37,7 @@#define CONFIG_BAUDRATE 115200#define CONFIG_BOOTDELAY 5#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ +#define CONFIG_BOARD_EARLY_INIT_F 1/*************************************************************** * U-boot generic defines start here.
@@ -45,7 +46,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
@@ -85,8 +85,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
@@ -112,7 +113,7 @@/* 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/* 16MB SDRAM */ #define CONFIG_SYS_SDR_CONFIG 0x3A
@@ -122,6 +123,7 @@#define CONFIG_SYS_DRAM_SIZE 0x01000000/* FLASH organization */ +#define CONFIG_SYS_TEXT_BASE 0x50000000#define CONFIG_SYS_MAX_FLASH_BANKS 1/* max number of sectors on one chip */ #define CONFIG_SYS_MAX_FLASH_SECT 140
@@ -184,13 +186,15 @@"npe_ucode=50040000\0" \"mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \"kerneladdr=50050000\0" \ +"kernelfile=actux2/uImage\0" \ +"rootfile=actux2/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} actux2/u-boot.bin;" \" run eraseboot writeboot\0" \"eraseboot=protect off 50000000 50003fff;" \" protect off 50006000 5003ffff;" \
@@ -200,6 +204,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" \
@@ -218,4 +225,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 */
Signature · 1 line
1.7.2.3
PATCH 8/13 update/fix AcTux3 board
In reply to Michael Schwingen--- board/actux3/actux3.c | 27 +++++++++++++++------------ board/actux3/config.mk | 2 -- board/actux3/u-boot.lds | 45 ++++++++++++++++++++++++++++----------------- include/configs/actux3.h | 23 +++++++++++++++++------ 4 files changed, 60 insertions(+), 37 deletions(-)
board/actux3/actux3.c +15 -12
@@ -43,6 +43,19 @@DECLARE_GLOBAL_DATA_PTR ; +int board_early_init_f (void ) +{ +/* CS1: IPAC-X */ + *IXP425_EXP_CS1 =0x94d10013 ; +/* CS5: Debug port */ + *IXP425_EXP_CS5 =0x9d520003 ; +/* CS6: Release/Option register */ + *IXP425_EXP_CS6 =0x81860001 ; +/* CS7: LEDs */ + *IXP425_EXP_CS7 =0x80900003 ; +return 0 ; +} +int board_init (void ) { gd->bd->bi_arch_number =MACH_TYPE_ACTUX3 ;
@@ -81,15 +94,7 @@ int board_init (void)GPIO_OUTPUT_ENABLE (CONFIG_SYS_GPIO_EXTBUS_CLK ); *IXP425_GPIO_GPCLKR =0x011001FF ; -/* CS1: IPAC-X */ - *IXP425_EXP_CS1 =0x94d10013 ; -/* CS5: Debug port */ - *IXP425_EXP_CS5 =0x9d520003 ; -/* CS6: Release/Option register */ - *IXP425_EXP_CS6 =0x81860001 ; -/* CS7: LEDs */ - *IXP425_EXP_CS7 =0x80900003 ; - +/* we need a minimum PCI reset pulse width after enabling the clock */ udelay (533 );GPIO_OUTPUT_SET (CONFIG_SYS_GPIO_IORST );GPIO_OUTPUT_SET (CONFIG_SYS_GPIO_ETHRST );
@@ -138,9 +143,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 ); }
board/actux3/config.mk +0 -2
@@ -1,5 +1,3 @@ -CONFIG_SYS_TEXT_BASE = 0x00e00000 - # include NPE ethernet driver BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.o
board/actux3/u-boot.lds +28 -17
72 lines not on this page · raw message
include/configs/actux3.h +17 -6
@@ -37,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.
@@ -45,7 +46,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
@@ -83,8 +83,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
@@ -111,7 +112,7 @@/* 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/* 16MB SDRAM */ #define CONFIG_SYS_SDR_CONFIG 0x3A
@@ -121,6 +122,7 @@#define CONFIG_SYS_DRAM_SIZE 0x01000000/* FLASH organization */ +#define CONFIG_SYS_TEXT_BASE 0x50000000#define CONFIG_SYS_MAX_FLASH_BANKS 1/* max number of sectors on one chip */ #define CONFIG_SYS_MAX_FLASH_SECT 140
@@ -184,13 +186,15 @@"npe_ucode=50040000\0" \"mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \"kerneladdr=50050000\0" \ +"kernelfile=actux3/uImage\0" \ +"rootfile=actux3/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} actux3/u-boot.bin;" \" run eraseboot writeboot\0" \"eraseboot=protect off 50000000 50003fff;" \" protect off 50006000 5003ffff;" \
@@ -200,6 +204,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" \
@@ -210,7 +217,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" \
@@ -218,4 +225,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 */
Signature · 1 line
1.7.2.3
PATCH 9/13 update/fix AcTux4 board
In reply to Michael Schwingen--- board/actux4/actux4.c | 12 +++++++----- board/actux4/config.mk | 4 ---- include/configs/actux4.h | 22 +++++++++++++++++----- 3 files changed, 24 insertions(+), 14 deletions(-) delete mode 100644 board/actux4/config.mk
board/actux4/actux4.c +7 -5
@@ -42,6 +42,12 @@DECLARE_GLOBAL_DATA_PTR ; +int board_early_init_f (void ) +{ + *IXP425_EXP_CS1 =0xbd113c42 ; +return 0 ; +} +int board_init (void ) { gd->bd->bi_arch_number =MACH_TYPE_ACTUX4 ;
@@ -88,8 +94,6 @@ int board_init (void)GPIO_OUTPUT_ENABLE (CONFIG_SYS_GPIO_EXTBUS_CLK );GPIO_OUTPUT_ENABLE (CONFIG_SYS_GPIO_PCI_CLK ); - *IXP425_EXP_CS1 =0xbd113c42 ; -udelay (10000 );GPIO_OUTPUT_SET (CONFIG_SYS_GPIO_IORST );udelay (10000 );
@@ -109,9 +113,7 @@ int checkboard (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 ); }
board/actux4/config.mk deleted +0 -4
@@ -1,4 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x00e00000 - -# include NPE ethernet driver -BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.o
include/configs/actux4.h +17 -5
@@ -37,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.
@@ -45,7 +46,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
@@ -82,8 +82,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 66000000 +#define CONFIG_SYS_HZ 1000/* default load address */ #define CONFIG_SYS_LOAD_ADDR 0x00010000
@@ -109,7 +110,7 @@/* 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/* 32MB SDRAM */ #define CONFIG_SYS_SDR_CONFIG 0x18
@@ -119,6 +120,7 @@#define CONFIG_SYS_DRAM_SIZE 0x02000000/* FLASH organization */ +#define CONFIG_SYS_TEXT_BASE 0x50000000#define CONFIG_SYS_MAX_FLASH_BANKS 2/* max # of sectors per chip */ #define CONFIG_SYS_MAX_FLASH_SECT 70
@@ -153,6 +155,7 @@#define CONFIG_PHY_ADDR 0x1C/* MII PHY management */ #define CONFIG_MII 1 +/* Number of ethernet rx buffers & descriptors */ #define CONFIG_SYS_RX_ETH_BUFFER 16
@@ -181,19 +184,24 @@"mtd=IXP4XX-Flash.0:252k(uboot),4k(uboot_env);" \"IXP4XX-Flash.1:128k(ucode),1280k(linux),-(root)\0" \"kerneladdr=51020000\0" \ +"kernelfile=actux4/uImage\0" \ +"rootfile=actux4/rootfs\0" \"rootaddr=51160000\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} actux4/u-boot.bin;" \" run eraseboot writeboot\0" \"eraseboot=protect off 50000000 5003efff;" \" erase 50000000 +${filesize}\0" \"writeboot=cp.b 10000 50000000 ${filesize}\0" \"eraseenv=protect off 5003f000 5003ffff;" \" erase 5003f000 5003ffff\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" \
@@ -212,4 +220,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 */
Signature · 1 line
1.7.2.3
PATCH 10/13 update/fix some more IXP42x boards (only compile tested)
In reply to Michael Schwingen--- board/ixdp425/config.mk | 3 ++- board/prodrive/pdnb3/config.mk | 2 +- boards.cfg | 2 +- include/configs/ixdp425.h | 13 ++++++++++--- include/configs/ixdpg425.h | 9 ++++++--- include/configs/pdnb3.h | 6 ++++++ 6 files changed, 26 insertions(+), 9 deletions(-)
board/ixdp425/config.mk +2 -1
@@ -1,2 +1,3 @@ # -CONFIG_SYS_TEXT_BASE = 0x00f80000 +CONFIG_SYS_TEXT_BASE = 0x50000000 +
board/prodrive/pdnb3/config.mk +1 -1
@@ -1,2 +1,2 @@ # -CONFIG_SYS_TEXT_BASE = 0x01f00000 +CONFIG_SYS_TEXT_BASE = 0x50000000
boards.cfg +1 -1
@@ -130,7 +130,7 @@ actux2 arm ixp actux3 arm ixp actux4 arm ixp ixdp425 arm ixp -ixdpg425 arm ixp +ixdpg425 arm ixp ixdp425 lpd7a400 arm lh7a40x lpd7a40x lpd7a404 arm lh7a40x lpd7a40x balloon3 arm pxa
include/configs/ixdp425.h +10 -3
@@ -105,8 +105,10 @@#define CONFIG_SYS_LOAD_ADDR 0x00010000/* default load address */ -#define CONFIG_SYS_HZ 3333333/* spec says 66.666 MHz, but it appears to be 33 */ -/* valid baudrates */ +/* timer clock - 2* OSC_IN system clock */ +#define CONFIG_IXP425_TIMER_CLK 66666666 +#define CONFIG_SYS_HZ 1000 +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }/*
@@ -193,7 +195,12 @@#define CONFIG_SYS_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CONFIG_ENV_SECT_SIZE 0x20000/* size of one complete sector */ -#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x40000)#define CONFIG_ENV_SIZE 0x2000/* Total Size of Environment Sector */ +/* additions for new relocation code, must be added to all boards */ +#define CONFIG_SYS_SDRAM_BASE 0 +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE) +#endif /* __CONFIG_H */
include/configs/ixdpg425.h +6 -3
@@ -53,9 +53,6 @@/* * Misc configuration options */ -#undef CONFIG_USE_IRQ/* we don't need IRQ/FIQ stuff */ -#define CONFIG_USE_IRQ 1/* we need IRQ stuff for timer */ -#define CONFIG_TIMER_IRQ #define CONFIG_BOOTCOUNT_LIMIT /* support for bootcount limit */ #define CONFIG_SYS_BOOTCOUNT_ADDR 0x60003000/* inside qmrg sram */
@@ -115,6 +112,7 @@#define CONFIG_SYS_MEMTEST_END 0x00800000/* 4 ... 8 MB in DRAM */ #define CONFIG_SYS_LOAD_ADDR 0x00010000/* default load address */ +#define CONFIG_IXP425_TIMER_CLK 66666666#define CONFIG_SYS_HZ 1000/* decrementer freq: 1 ms ticks */ /* valid baudrates */
@@ -248,4 +246,9 @@*/ #define CONFIG_SYS_CACHELINE_SIZE 32 +/* additions for new relocation code, must be added to all boards */ +#define CONFIG_SYS_SDRAM_BASE 0 +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE) +#endif /* __CONFIG_H */
include/configs/pdnb3.h +6 -0
@@ -117,6 +117,7 @@#define CONFIG_SYS_MEMTEST_END 0x00800000/* 4 ... 8 MB in DRAM */ #define CONFIG_SYS_LOAD_ADDR 0x00010000/* default load address */ +#define CONFIG_IXP425_TIMER_CLK 66666666#define CONFIG_SYS_HZ 1000/* decrementer freq: 1 ms ticks */ /* valid baudrates */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
@@ -345,4 +346,9 @@*/ #define CONFIG_SYS_CACHELINE_SIZE 32 +/* additions for new relocation code, must be added to all boards */ +#define CONFIG_SYS_SDRAM_BASE 0x00000000 +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE) +#endif /* __CONFIG_H */
Signature · 1 line
1.7.2.3
PATCH 11/13 add dvlhost (dLAN 200 AV Wireless G) board
In reply to Michael Schwingen--- MAINTAINERS | 1 + board/dvlhost/Makefile | 50 +++++++++ board/dvlhost/config.mk | 5 + board/dvlhost/dvlhost.c | 118 +++++++++++++++++++++ board/dvlhost/dvlhost_hw.h | 47 +++++++++ board/dvlhost/u-boot.lds | 86 +++++++++++++++ board/dvlhost/watchdog.c | 40 +++++++ boards.cfg | 1 + include/configs/dvlhost.h | 248 ++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 596 insertions(+), 0 deletions(-) create mode 100644 board/dvlhost/Makefile create mode 100644 board/dvlhost/config.mk create mode 100644 board/dvlhost/dvlhost.c create mode 100644 board/dvlhost/dvlhost_hw.h create mode 100644 board/dvlhost/u-boot.lds create mode 100644 board/dvlhost/watchdog.c create mode 100644 include/configs/dvlhost.h
MAINTAINERS +1 -0
@@ -795,6 +795,7 @@ Michael Schwingen <[email protected]> actux2 xscale/ixp actux3 xscale/ixp actux4 xscale/ixp + dvlhost xscale/ixp Andrea Scian <[email protected]>
board/dvlhost/Makefile new file +50 -0
50 lines not on this page · raw message
board/dvlhost/config.mk new file +5 -0
@@ -0,0 +1,5 @@ +# include NPE ethernet driver +BOARDLIBS = cpu/ixp/npe/libnpe.a + +LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds +
board/dvlhost/dvlhost.c new file +118 -0
118 lines not on this page · raw message
board/dvlhost/dvlhost_hw.h new file +47 -0
47 lines not on this page · raw message
board/dvlhost/u-boot.lds new file +86 -0
86 lines not on this page · raw message
board/dvlhost/watchdog.c new file +40 -0
@@ -0,0 +1,40 @@ +/* +* (C) Copyright 2009 +* Michael Schwingen, michael at schwingen.org +* +* 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 <common.h> +#include <config.h> + +#include "dvlhost_hw.h" + +DECLARE_GLOBAL_DATA_PTR ; + +#ifdef CONFIG_HW_WATCHDOG +#include <watchdog.h> +#include <asm/arch/ixp425.h> + +void hw_watchdog_reset (void ) +{ + *IXP425_GPIO_GPOUTR ^= (1 << (CONFIG_SYS_GPIO_WDGTRIGGER )); +} + +#endif /* CONFIG_HW_WATCHDOG */
boards.cfg +1 -0
@@ -129,6 +129,7 @@ actux1_8_32 arm ixp actux1 - actux2 arm ixp actux3 arm ixp actux4 arm ixp +dvlhost arm ixp ixdp425 arm ixp ixdpg425 arm ixp ixdp425 lpd7a400 arm lh7a40x lpd7a40x
include/configs/dvlhost.h new file +248 -0
248 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH 12/13 add support for function-sections
In reply to Michael Schwingen--- config.mk | 6 ++++++ include/configs/actux1.h | 1 + include/configs/actux2.h | 1 + include/configs/actux3.h | 1 + include/configs/actux4.h | 1 + 5 files changed, 10 insertions(+), 0 deletions(-)
config.mk +6 -0
@@ -152,6 +152,9 @@ endif RELFLAGS= $(PLATFORM_RELFLAGS) DBGFLAGS= -g # -DDEBUG OPTFLAGS= -Os #-fomit-frame-pointer +ifeq ($(CONFIG_USE_FUNCTION_SECTIONS),y) +OPTFLAGS += -ffunction-sections +endif ifndef LDSCRIPT #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug ifeq ($(CONFIG_NAND_U_BOOT),y)
@@ -205,6 +208,9 @@ endif AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS) LDFLAGS += -Bstatic -T $(obj)u-boot.lds $(PLATFORM_LDFLAGS) +ifeq ($(CONFIG_USE_FUNCTION_SECTIONS),y) +LDFLAGS += --gc-sections +endif ifneq ($(CONFIG_SYS_TEXT_BASE),) LDFLAGS += -Ttext $(CONFIG_SYS_TEXT_BASE) endif
include/configs/actux1.h +1 -0
@@ -28,6 +28,7 @@#define CONFIG_IXP425 1#define CONFIG_ACTUX1 1 +#define CONFIG_USE_FUNCTION_SECTIONS 1#define CONFIG_DISPLAY_CPUINFO 1#define CONFIG_DISPLAY_BOARDINFO 1
include/configs/actux2.h +1 -0
@@ -28,6 +28,7 @@#define CONFIG_IXP425 1#define CONFIG_ACTUX2 1 +#define CONFIG_USE_FUNCTION_SECTIONS 1#define CONFIG_DISPLAY_CPUINFO 1#define CONFIG_DISPLAY_BOARDINFO 1
include/configs/actux3.h +1 -0
@@ -28,6 +28,7 @@#define CONFIG_IXP425 1#define CONFIG_ACTUX3 1 +#define CONFIG_USE_FUNCTION_SECTIONS 1#define CONFIG_DISPLAY_CPUINFO 1#define CONFIG_DISPLAY_BOARDINFO 1
include/configs/actux4.h +1 -0
@@ -28,6 +28,7 @@#define CONFIG_IXP425 1#define CONFIG_ACTUX4 1 +#define CONFIG_USE_FUNCTION_SECTIONS 1#define CONFIG_DISPLAY_CPUINFO 1#define CONFIG_DISPLAY_BOARDINFO 1
Signature · 1 line
1.7.2.3
PATCH 12/13 add support for function-sections
Quoted 14 lines · On Tuesday, December 28, 2010 07:43:30 Michael Schwingen wrote:
Signed-off-by Michael Schwingen <[email protected]>--- config.mk | 6 ++++++ include/configs/actux1.h | 1 + include/configs/actux2.h | 1 + include/configs/actux3.h | 1 + include/configs/actux4.h | 1 + 5 files changed, 10 insertions(+), 0 deletions(-)config.mk +0
-0
config.mk endif · line 157
Quoted 6 lines
config.mk +3
-0@@ -152,6 +152,9 @@ endif RELFLAGS= $(PLATFORM_RELFLAGS) DBGFLAGS= -g # -DDEBUG OPTFLAGS= -Os #-fomit-frame-pointer +ifeq ($(CONFIG_USE_FUNCTION_SECTIONS),y) +OPTFLAGS += -ffunction-sections +endif
you can already do this with board config.mk and PLATFORM_RELFLAGS. no need to introduce some random new config name for a random compiler flag.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20101228/e3987907/attachment.pgp
PATCH 12/13 add support for function-sections
Am 12/29/2010 05:47 AM, schrieb Mike Frysinger:
Quoted 10 lines · On Tuesday, December 28, 2010 07:43:30 Michael Schwingen wrote:
Quoted 9 lines
Signed-off-by Michael Schwingen <[email protected]>--- config.mk | 6 ++++++ include/configs/actux1.h | 1 + include/configs/actux2.h | 1 + include/configs/actux3.h | 1 + include/configs/actux4.h | 1 + 5 files changed, 10 insertions(+), 0 deletions(-)
Quoted 13 lines
config.mk endif · line 157
Quoted 11 lines
config.mk +3
-0@@ -152,6 +152,9 @@ endif RELFLAGS= $(PLATFORM_RELFLAGS) DBGFLAGS= -g # -DDEBUG OPTFLAGS= -Os #-fomit-frame-pointer +ifeq ($(CONFIG_USE_FUNCTION_SECTIONS),y) +OPTFLAGS += -ffunction-sections +endifyou can already do this with board config.mk and
PLATFORM_RELFLAGS. no need to introduce some random new config name for a random compiler flag.
OK, I had not seen that possibility.
Setting a platform variable in a board-dependant way sounds a bit wrong, but it works.
cu
Michael
PATCH 12/13 add support for function-sections
Quoted 30 lines · On Wednesday, December 29, 2010 03:28:51 Michael Schwingen wrote:
Am 12/29/2010 05:47 AM, schrieb Mike Frysinger:
Quoted 21 lines · On Tuesday, December 28, 2010 07:43:30 Michael Schwingen wrote:
Quoted 20 lines
Signed-off-by Michael Schwingen <[email protected]>---
config.mk | 6 ++++++ include/configs/actux1.h | 1 + include/configs/actux2.h | 1 + include/configs/actux3.h | 1 + include/configs/actux4.h | 1 + 5 files changed, 10 insertions(+), 0 deletions(-)config.mk +0
-0@@ -152,6 +152,9 @@ endif RELFLAGS= $(PLATFORM_RELFLAGS) DBGFLAGS= -g # -DDEBUG OPTFLAGS= -Os #-fomit-frame-pointerQuoted 7 lines
config.mk endif · line 157
Quoted 3 lines
config.mk +3
-0+ifeq ($(CONFIG_USE_FUNCTION_SECTIONS),y) +OPTFLAGS += -ffunction-sections +endifyou can already do this with board config.mk and
PLATFORM_RELFLAGS. no need to introduce some random new config name for a random compiler flag.
Quoted 3 lines
OK, I had not seen that possibility.
Setting a platform variable in a board-dependant way sounds a bit wrong, but it works.
you should be appending it, not setting it
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20101229/658d61f5/attachment.pgp
PATCH 13/13 add support for fixed-speed MII ports (no standard PHY registers)
In reply to Michael Schwingen--- arch/arm/cpu/ixp/npe/npe.c | 18 +++++++++++++++++- include/configs/actux2.h | 5 +++++ include/configs/actux3.h | 5 +++++ 3 files changed, 27 insertions(+), 1 deletions(-)
arch/arm/cpu/ixp/npe/npe.c +17 -1
@@ -359,6 +359,21 @@ static int npe_init(struct eth_device *dev, bd_t * bis)debug ("%s: 1\n" , __FUNCTION__); +#ifdef CONFIG_MII_NPE0_FIXEDLINK +if (0 == p_npe->eth_id) { + speed =CONFIG_MII_NPE0_SPEED ; + duplex =CONFIG_MII_NPE0_FULLDUPLEX ?FULL :HALF ; + } + else +#endif +#ifdef CONFIG_MII_NPE1_FIXEDLINK +if (1 == p_npe->eth_id) { + speed =CONFIG_MII_NPE1_SPEED ; + duplex =CONFIG_MII_NPE1_FULLDUPLEX ?FULL :HALF ; + } + else +#endif + {miiphy_read (dev->name, p_npe->phy_no,PHY_BMSR , ®_short);/*
@@ -388,7 +403,8 @@ static int npe_init(struct eth_device *dev, bd_t * bis) speed =miiphy_speed (dev->name, p_npe->phy_no); duplex =miiphy_duplex (dev->name, p_npe->phy_no); - + } +if (p_npe->print_speed) { p_npe->print_speed =0 ; printf ("ENET Speed is %d Mbps - %s duplex connection\n",
include/configs/actux2.h +5 -0
@@ -153,6 +153,11 @@#define CONFIG_PHY_ADDR 0x00/* MII PHY management */ #define CONFIG_MII 1 +/* fixed-speed switch without standard PHY registers on MII */ +#define CONFIG_MII_NPE0_FIXEDLINK 1 +#define CONFIG_MII_NPE0_SPEED 100 +#define CONFIG_MII_NPE0_FULLDUPLEX 1 +/* Number of ethernet rx buffers & descriptors */ #define CONFIG_SYS_RX_ETH_BUFFER 16#define CONFIG_RESET_PHY_R 1
include/configs/actux3.h +5 -0
@@ -153,6 +153,11 @@#define CONFIG_PHY_ADDR 0x10/* MII PHY management */ #define CONFIG_MII 1 +/* fixed-speed switch without standard PHY registers on MII */ +#define CONFIG_MII_NPE0_FIXEDLINK 1 +#define CONFIG_MII_NPE0_SPEED 100 +#define CONFIG_MII_NPE0_FULLDUPLEX 1 +/* Number of ethernet rx buffers & descriptors */ #define CONFIG_SYS_RX_ETH_BUFFER 16#define CONFIG_RESET_PHY_R 1
Signature · 1 line
1.7.2.3
PATCH 13/13 add support for fixed-speed MII ports (no standard PHY registers)
Quoted 3 lines · On Tuesday, December 28, 2010 07:43:31 Michael Schwingen wrote:
arch/arm/cpu/ixp/npe/npe.c | 18 +++++++++++++++++- include/configs/actux2.h | 5 +++++ include/configs/actux3.h | 5 +++++
considering this patch is for IXP npe only, your patch summary should have a qualifier like "IXP: npe:" or something.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20101228/26e5b1c5/attachment.pgp