June 2012 - U-Boot

[U-Boot] [PATCH] mx6: Make pad name macro consistent with the datasheet
by Ashok 18 Jul '12

18 Jul '12

Use the same name as defined in the datasheet. DSP_CLK -> DISP_CLK Signed-off-by: Ashok Kumar Reddy Kourla <ashokkourla2000(a)gmail.com> --- arch/arm/include/asm/arch-mx6/mx6x_pins.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch-mx6/mx6x_pins.h b/arch/arm/include/asm/arch-mx6/mx6x_pins.h index afaa068..377d97f 100644 --- a/arch/arm/include/asm/arch-mx6/mx6x_pins.h +++ b/arch/arm/include/asm/arch-mx6/mx6x_pins.h @@ -530,8 +530,8 @@ enum { MX6Q_PAD_EIM_BCLK__IPU1_DI1_PIN16 = IOMUX_PAD(0x046C, 0x0158, 1, 0x0000, 0, 0), MX6Q_PAD_EIM_BCLK__GPIO_6_31 = IOMUX_PAD(0x046C, 0x0158, 5, 0x0000, 0, 0), MX6Q_PAD_EIM_BCLK__TPSMP_HDATA_31 = IOMUX_PAD(0x046C, 0x0158, 6, 0x0000, 0, 0), - MX6Q_PAD_DI0_DISP_CLK__IPU1_DI0_DSP_CLK = IOMUX_PAD(0x0470, 0x015C, 0, 0x0000, 0, 0), - MX6Q_PAD_DI0_DISP_CLK__IPU2_DI0_DSP_CLK = IOMUX_PAD(0x0470, 0x015C, 1, 0x0000, 0, 0), + MX6Q_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK = IOMUX_PAD(0x0470, 0x015C, 0, 0x0000, 0, 0), + MX6Q_PAD_DI0_DISP_CLK__IPU2_DI0_DISP_CLK = IOMUX_PAD(0x0470, 0x015C, 1, 0x0000, 0, 0), MX6Q_PAD_DI0_DISP_CLK__MIPI_CR_DPY_OT28 = IOMUX_PAD(0x0470, 0x015C, 3, 0x0000, 0, 0), MX6Q_PAD_DI0_DISP_CLK__SDMA_DBG_CR_STA0 = IOMUX_PAD(0x0470, 0x015C, 4, 0x0000, 0, 0), MX6Q_PAD_DI0_DISP_CLK__GPIO_4_16 = IOMUX_PAD(0x0470, 0x015C, 5, 0x0000, 0, 0), -- 1.7.0.4

4 4

[U-Boot] [PATCH 00/20] updates for Keymile Marvell boards
by Valentin Longchamp 16 Jul '12

16 Jul '12

This series adds support for 2 new Kirkwood boards at Keymile: kmnusa and kmcoge5un. All the previously supported boards that had a proper config file now are all supported by the generic km_kirkwood.h config file. This series also adds support for the environment variables in the SPI NOR Flash, for a skippable FPGA download through the BOCO2 CPLD, and for the configuration of a managed Marvell switch that is used on kmnusa. This series also corrects a bug caused by accessing global static tables in board_early_init_f that is called before relocation which must be avoided. Holger Brunck (6): arm/km: add kmnusa board support arm/km: add kmcoge5un board support arm/km: convert mgcoge3un target to km_kirkwood arm/km: remove portl2.h and use km_kirkwood instead arm/km: cleanup km_kirkwood boards arm/km: remove spi toggle command Thomas Herzmann (2): arm/km: add implementation for read_dip_switch arm/km: fix testpin detection for kmcoge5un Valentin Longchamp (12): arm/km: enable spi claim bus arm/km: use correct kw_gpio function for NAND/SPI switching arm/kirkwood: protect the ENV_SPI #defines arm/km: correct init of 88e6352 switch in the reset_phy function arm/km: enable BOCO2 FPGA download support arm/km: redefine piggy 4 reg names to avoid conflicts arm/km: add support for external switch configuration arm/km: enable external switch configuration for kmnusa arm/km: skip FPGA config when already configured arm/km: support the 2 PCIe fpga resets arm/km: implement weak function board_spi_clam_bus/release arm/km: remove calls to kw_gpio_* in board_early_init_f MAINTAINERS | 2 + arch/arm/include/asm/arch-kirkwood/config.h | 12 +- board/keymile/common/common.h | 5 + board/keymile/km_arm/128M16-1.cfg | 294 +++++++++++++++++++++++++ board/keymile/km_arm/256M8-1.cfg | 296 +++++++++++++++++++++++++ board/keymile/km_arm/Makefile | 8 + board/keymile/km_arm/fpga_config.c | 256 ++++++++++++++++++++++ board/keymile/km_arm/km_arm.c | 169 +++++++++------ board/keymile/km_arm/managed_switch.c | 316 +++++++++++++++++++++++++++ board/keymile/km_arm/managed_switch.h | 106 +++++++++ boards.cfg | 10 +- include/configs/km/km_arm.h | 57 ++++- include/configs/km_kirkwood.h | 154 ++++++++++++- include/configs/mgcoge3un.h | 87 -------- include/configs/portl2.h | 85 ------- 15 files changed, 1583 insertions(+), 274 deletions(-) create mode 100644 board/keymile/km_arm/128M16-1.cfg create mode 100644 board/keymile/km_arm/256M8-1.cfg create mode 100644 board/keymile/km_arm/fpga_config.c create mode 100644 board/keymile/km_arm/managed_switch.c create mode 100644 board/keymile/km_arm/managed_switch.h delete mode 100644 include/configs/mgcoge3un.h delete mode 100644 include/configs/portl2.h

6 61

[U-Boot] [PATCH v2 1/2] imx: Use a clear identification of an unidentified CPU type
by Otavio Salvador 16 Jul '12

16 Jul '12

In case an unidentified CPU type is detected it now returns i.MX??, in a const char. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> Cc: Marek Vasut <marex(a)denx.de> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes for v2: * use i.MX?? for unidentified CPU type arch/arm/cpu/armv7/imx-common/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/imx-common/cpu.c b/arch/arm/cpu/armv7/imx-common/cpu.c index b3195dd..e7bd0bf 100644 --- a/arch/arm/cpu/armv7/imx-common/cpu.c +++ b/arch/arm/cpu/armv7/imx-common/cpu.c @@ -66,7 +66,7 @@ char *get_reset_cause(void) #if defined(CONFIG_DISPLAY_CPUINFO) -static char *get_imx_type(u32 imxtype) +static const char *get_imx_type(u32 imxtype) { switch (imxtype) { case 0x63: @@ -80,7 +80,7 @@ static char *get_imx_type(u32 imxtype) case 0x53: return "53"; default: - return "unknown"; + return "??"; } } -- 1.7.10

2 4

[U-Boot] [PATCH 1/3] mxc_i2c: specify i2c base address in config file
by Troy Kisky 16 Jul '12

16 Jul '12

The following platforms had their config files changed flea3, imx31_phycore, mx35pdk, mx53ard, mx53evk, mx53smd Signed-off-by: Troy Kisky <troy.kisky(a)boundarydevices.com> --- arch/arm/include/asm/arch-mx31/imx-regs.h | 7 +++++++ arch/arm/include/asm/arch-mx35/imx-regs.h | 2 +- drivers/i2c/mxc_i2c.c | 25 ++++--------------------- include/configs/flea3.h | 2 +- include/configs/imx31_phycore.h | 3 ++- include/configs/mx35pdk.h | 2 +- include/configs/mx53ard.h | 2 +- include/configs/mx53evk.h | 2 +- include/configs/mx53smd.h | 2 +- 9 files changed, 19 insertions(+), 28 deletions(-) diff --git a/arch/arm/include/asm/arch-mx31/imx-regs.h b/arch/arm/include/asm/arch-mx31/imx-regs.h index 6454acb..7ddbbd6 100644 --- a/arch/arm/include/asm/arch-mx31/imx-regs.h +++ b/arch/arm/include/asm/arch-mx31/imx-regs.h @@ -606,6 +606,13 @@ struct esdc_regs { #define UART4_BASE 0x43FB0000 #define UART5_BASE 0x43FB4000 +#define I2C1_BASE_ADDR 0x43f80000 +#define I2C1_CLK_OFFSET 26 +#define I2C2_BASE_ADDR 0x43F98000 +#define I2C2_CLK_OFFSET 28 +#define I2C3_BASE_ADDR 0x43f84000 +#define I2C3_CLK_OFFSET 30 + #define ESDCTL_SDE (1 << 31) #define ESDCTL_CMD_RW (0 << 28) #define ESDCTL_CMD_PRECHARGE (1 << 28) diff --git a/arch/arm/include/asm/arch-mx35/imx-regs.h b/arch/arm/include/asm/arch-mx35/imx-regs.h index e570ad1..3146006 100644 --- a/arch/arm/include/asm/arch-mx35/imx-regs.h +++ b/arch/arm/include/asm/arch-mx35/imx-regs.h @@ -39,7 +39,7 @@ #define MAX_BASE_ADDR 0x43F04000 #define EVTMON_BASE_ADDR 0x43F08000 #define CLKCTL_BASE_ADDR 0x43F0C000 -#define I2C_BASE_ADDR 0x43F80000 +#define I2C1_BASE_ADDR 0x43F80000 #define I2C3_BASE_ADDR 0x43F84000 #define ATA_BASE_ADDR 0x43F8C000 #define UART1_BASE 0x43F90000 diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index c88ac7c..416ffee 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -59,27 +59,10 @@ struct mxc_i2c_regs { #define I2SR_IIF (1 << 1) #define I2SR_RX_NO_AK (1 << 0) -#if defined(CONFIG_SYS_I2C_MX31_PORT1) -#define I2C_BASE 0x43f80000 -#define I2C_CLK_OFFSET 26 -#elif defined (CONFIG_SYS_I2C_MX31_PORT2) -#define I2C_BASE 0x43f98000 -#define I2C_CLK_OFFSET 28 -#elif defined (CONFIG_SYS_I2C_MX31_PORT3) -#define I2C_BASE 0x43f84000 -#define I2C_CLK_OFFSET 30 -#elif defined(CONFIG_SYS_I2C_MX53_PORT1) -#define I2C_BASE I2C1_BASE_ADDR -#elif defined(CONFIG_SYS_I2C_MX53_PORT2) -#define I2C_BASE I2C2_BASE_ADDR -#elif defined(CONFIG_SYS_I2C_MX35_PORT1) -#define I2C_BASE I2C_BASE_ADDR -#elif defined(CONFIG_SYS_I2C_MX35_PORT2) -#define I2C_BASE I2C2_BASE_ADDR -#elif defined(CONFIG_SYS_I2C_MX35_PORT3) -#define I2C_BASE I2C3_BASE_ADDR +#ifdef CONFIG_SYS_I2C_BASE +#define I2C_BASE CONFIG_SYS_I2C_BASE #else -#error "define CONFIG_SYS_I2C_MX<Processor>_PORTx to use the mx I2C driver" +#error "define CONFIG_SYS_I2C_BASE to use the mxc_i2c driver" #endif #define I2C_MAX_TIMEOUT 10000 @@ -114,7 +97,7 @@ static uint8_t i2c_imx_get_clk(unsigned int rate) (struct clock_control_regs *)CCM_BASE; /* start the required I2C clock */ - writel(readl(&sc_regs->cgr0) | (3 << I2C_CLK_OFFSET), + writel(readl(&sc_regs->cgr0) | (3 << CONFIG_SYS_I2C_CLK_OFFSET), &sc_regs->cgr0); #endif diff --git a/include/configs/flea3.h b/include/configs/flea3.h index f046a58..75330c4 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -68,7 +68,7 @@ */ #define CONFIG_HARD_I2C #define CONFIG_I2C_MXC -#define CONFIG_SYS_I2C_MX35_PORT3 +#define CONFIG_SYS_I2C_BASE I2C3_BASE_ADDR #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe #define CONFIG_MXC_SPI diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 3153eb5..197cefa 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -54,7 +54,8 @@ #define CONFIG_HARD_I2C #define CONFIG_I2C_MXC -#define CONFIG_SYS_I2C_MX31_PORT2 +#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR +#define CONFIG_SYS_I2C_CLK_OFFSET I2C2_CLK_OFFSET #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index de4b954..dfe39b8 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -59,7 +59,7 @@ */ #define CONFIG_HARD_I2C #define CONFIG_I2C_MXC -#define CONFIG_SYS_I2C_MX35_PORT1 +#define CONFIG_SYS_I2C_BASE I2C1_BASE_ADDR #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe #define CONFIG_MXC_SPI diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index f48a41e..0bdf6a3 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -50,7 +50,7 @@ #define CONFIG_CMD_I2C #define CONFIG_HARD_I2C #define CONFIG_I2C_MXC -#define CONFIG_SYS_I2C_MX53_PORT2 +#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index a77e5b2..3c7c329 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -53,7 +53,7 @@ #define CONFIG_CMD_I2C #define CONFIG_HARD_I2C #define CONFIG_I2C_MXC -#define CONFIG_SYS_I2C_MX53_PORT2 1 +#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index a04db3f..a904130 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -50,7 +50,7 @@ #define CONFIG_CMD_I2C #define CONFIG_HARD_I2C #define CONFIG_I2C_MXC -#define CONFIG_SYS_I2C_MX53_PORT2 +#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe -- 1.7.5.4

7 19

[U-Boot] [PATCH 1/2] Remove unused CONFIG_STACKSIZE
by Rob Herring 13 Jul '12

13 Jul '12

From: Rob Herring <rob.herring(a)calxeda.com> CONFIG_STACKSIZE is not referenced anywhere except on AVR32, but present in most ARM boards. The IRQ and FIQ stacks are not setup in start.S, but arch/arm/lib/board.c, so also remove those comments. Cc: Albert ARIBAUD <albert.u.boot(a)aribaud.net> Signed-off-by: Rob Herring <rob.herring(a)calxeda.com> --- include/configs/SX1.h | 3 --- include/configs/VCMA9.h | 2 -- include/configs/a320evb.h | 3 --- include/configs/actux1.h | 6 ------ include/configs/actux2.h | 6 ------ include/configs/actux3.h | 7 ------- include/configs/actux4.h | 6 ------ include/configs/adp-ag101.h | 7 ------- include/configs/adp-ag101p.h | 7 ------- include/configs/adp-ag102.h | 7 ------- include/configs/afeb9260.h | 2 -- include/configs/am3517_crane.h | 7 ------- include/configs/am3517_evm.h | 7 ------- include/configs/apollon.h | 7 ------- include/configs/at91rm9200ek.h | 1 - include/configs/at91sam9260ek.h | 2 -- include/configs/at91sam9261ek.h | 2 -- include/configs/at91sam9263ek.h | 2 -- include/configs/at91sam9m10g45ek.h | 2 -- include/configs/at91sam9rlek.h | 2 -- include/configs/balloon3.h | 1 - include/configs/ca9x4_ct_vxp.h | 1 - include/configs/calimain.h | 1 - include/configs/cam_enc_4xx.h | 1 - include/configs/cm4008.h | 3 --- include/configs/cm41xx.h | 3 --- include/configs/cm_t35.h | 7 ------- include/configs/colibri_pxa270.h | 3 --- include/configs/cpu9260.h | 2 -- include/configs/cpuat91.h | 1 - include/configs/da830evm.h | 1 - include/configs/da850evm.h | 1 - include/configs/davinci_dm355evm.h | 1 - include/configs/davinci_dm355leopard.h | 1 - include/configs/davinci_dm365evm.h | 1 - include/configs/davinci_dm6467evm.h | 1 - include/configs/davinci_dvevm.h | 1 - include/configs/davinci_schmoogie.h | 1 - include/configs/davinci_sffsdr.h | 1 - include/configs/davinci_sonata.h | 1 - include/configs/devkit3250.h | 1 - include/configs/devkit8000.h | 3 --- include/configs/dig297.h | 3 --- include/configs/dvlhost.h | 3 --- include/configs/ea20.h | 1 - include/configs/eb_cpux9k2.h | 2 -- include/configs/edminiv2.h | 1 - include/configs/efikamx.h | 7 ------- include/configs/enbw_cmc.h | 1 - include/configs/ethernut5.h | 4 ++-- include/configs/flea3.h | 8 -------- include/configs/hawkboard.h | 1 - include/configs/highbank.h | 3 --- include/configs/igep00x0.h | 7 ------- include/configs/ima3-mx53.h | 3 --- include/configs/imx27lite-common.h | 1 - include/configs/imx31_litekit.h | 7 ------- include/configs/imx31_phycore.h | 7 ------- include/configs/integratorap.h | 3 --- include/configs/integratorcp.h | 3 --- include/configs/jadecpu.h | 2 -- include/configs/jornada.h | 6 ------ include/configs/km/km_arm.h | 1 - include/configs/lubbock.h | 3 --- include/configs/m28evk.h | 1 - include/configs/mcx.h | 7 ------- include/configs/meesc.h | 2 -- include/configs/mv-common.h | 1 - include/configs/mx1ads.h | 3 --- include/configs/mx25pdk.h | 3 --- include/configs/mx28evk.h | 1 - include/configs/mx31ads.h | 7 ------- include/configs/mx31pdk.h | 7 ------- include/configs/mx35pdk.h | 8 -------- include/configs/mx51evk.h | 7 ------- include/configs/mx53ard.h | 3 --- include/configs/mx53evk.h | 3 --- include/configs/mx53loco.h | 3 --- include/configs/mx53smd.h | 3 --- include/configs/mx6qarm2.h | 1 - include/configs/mx6qsabrelite.h | 1 - include/configs/nhk8815.h | 1 - include/configs/ns9750dev.h | 3 --- include/configs/omap1510inn.h | 3 --- include/configs/omap2420h4.h | 3 --- include/configs/omap3_beagle.h | 7 ------- include/configs/omap3_evm_common.h | 6 ------ include/configs/omap3_logic.h | 7 ------- include/configs/omap3_mvblx.h | 7 ------- include/configs/omap3_overo.h | 7 ------- include/configs/omap3_pandora.h | 7 ------- include/configs/omap3_sdp3430.h | 7 ------- include/configs/omap3_zoom1.h | 7 ------- include/configs/omap3_zoom2.h | 7 ------- include/configs/omap4_common.h | 3 --- include/configs/omap5912osk.h | 3 --- include/configs/omap5_evm.h | 3 --- include/configs/omap730p2.h | 4 ---- include/configs/origen.h | 3 --- include/configs/otc570.h | 2 -- include/configs/palmld.h | 1 - include/configs/palmtc.h | 1 - include/configs/pdnb3.h | 3 --- include/configs/pm9261.h | 2 -- include/configs/pm9263.h | 2 -- include/configs/pm9g45.h | 2 -- include/configs/pxa255_idp.h | 3 --- include/configs/qong.h | 6 ------ include/configs/s5p_goni.h | 3 --- include/configs/s5pc210_universal.h | 3 --- include/configs/sbc35_a9g20.h | 1 - include/configs/scb9328.h | 2 -- include/configs/smdk2410.h | 3 --- include/configs/smdk5250.h | 3 --- include/configs/smdk6400.h | 7 ------- include/configs/smdkc100.h | 7 ------- include/configs/smdkv310.h | 3 --- include/configs/snapper9260.h | 1 - include/configs/spear-common.h | 3 --- include/configs/tam3517-common.h | 6 ------ include/configs/tegra2-common.h | 6 ------ include/configs/tnetv107x_evm.h | 1 - include/configs/tny_a9260.h | 2 -- include/configs/top9000.h | 1 - include/configs/trats.h | 3 --- include/configs/tricorder.h | 3 --- include/configs/trizepsiv.h | 3 --- include/configs/tt01.h | 3 --- include/configs/tx25.h | 1 - include/configs/vct.h | 1 - include/configs/versatile.h | 3 --- include/configs/vision2.h | 5 ----- include/configs/vpac270.h | 1 - include/configs/xaeniax.h | 3 --- include/configs/zipitz2.h | 1 - include/configs/zmx25.h | 1 - 136 files changed, 2 insertions(+), 451 deletions(-) diff --git a/include/configs/SX1.h b/include/configs/SX1.h index ea09368..1c4f305 100644 --- a/include/configs/SX1.h +++ b/include/configs/SX1.h @@ -141,10 +141,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index 6ad4a6b..a173607 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -193,9 +193,7 @@ /* * Stack sizes - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4 * 1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4 * 1024) /* FIQ stack */ diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h index a2b347a..899383d 100644 --- a/include/configs/a320evb.h +++ b/include/configs/a320evb.h @@ -106,10 +106,7 @@ /* * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4 * 1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4 * 1024) /* FIQ stack */ diff --git a/include/configs/actux1.h b/include/configs/actux1.h index bdd2239..de29eb9 100644 --- a/include/configs/actux1.h +++ b/include/configs/actux1.h @@ -105,12 +105,6 @@ 115200, 230400 } #define CONFIG_SERIAL_RTS_ACTIVE 1 -/* - * Stack sizes - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ - /* Expansion bus settings */ #define CONFIG_SYS_EXP_CS0 0xbd113842 diff --git a/include/configs/actux2.h b/include/configs/actux2.h index c55571c..d2cc26c 100644 --- a/include/configs/actux2.h +++ b/include/configs/actux2.h @@ -98,12 +98,6 @@ 115200, 230400 } #define CONFIG_SERIAL_RTS_ACTIVE 1 -/* - * Stack sizes - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ - /* Expansion bus settings */ #define CONFIG_SYS_EXP_CS0 0xbd113042 diff --git a/include/configs/actux3.h b/include/configs/actux3.h index 78ee2b5..7165db0 100644 --- a/include/configs/actux3.h +++ b/include/configs/actux3.h @@ -96,13 +96,6 @@ 115200, 230400 } #define CONFIG_SERIAL_RTS_ACTIVE 1 -/* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ - /* Expansion bus settings */ #define CONFIG_SYS_EXP_CS0 0xbd113442 diff --git a/include/configs/actux4.h b/include/configs/actux4.h index c1105df..c34dca2 100644 --- a/include/configs/actux4.h +++ b/include/configs/actux4.h @@ -103,12 +103,6 @@ 115200, 230400 } #define CONFIG_SERIAL_RTS_ACTIVE 1 -/* - * Stack sizes - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ - /* Expansion bus settings */ #define CONFIG_SYS_EXP_CS0 0xbd113003 diff --git a/include/configs/adp-ag101.h b/include/configs/adp-ag101.h index 6bf0add..b6e3844 100644 --- a/include/configs/adp-ag101.h +++ b/include/configs/adp-ag101.h @@ -145,13 +145,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/* * Size of malloc() pool */ /* 512kB is suggested, (CONFIG_ENV_SIZE + 128 * 1024) was not enough */ diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 747d061..ef55e35 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -145,13 +145,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/* * Size of malloc() pool */ /* 512kB is suggested, (CONFIG_ENV_SIZE + 128 * 1024) was not enough */ diff --git a/include/configs/adp-ag102.h b/include/configs/adp-ag102.h index 35f88cc..eea44db 100644 --- a/include/configs/adp-ag102.h +++ b/include/configs/adp-ag102.h @@ -219,13 +219,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/* * Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h index 6715cb4..8192771 100644 --- a/include/configs/afeb9260.h +++ b/include/configs/afeb9260.h @@ -170,8 +170,6 @@ */ #define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) -#define CONFIG_STACKSIZE (32 * 1024) /* regular stack */ - #ifdef CONFIG_USE_IRQ #error CONFIG_USE_IRQ not supported #endif diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 54ab3eb..dd99370 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -256,13 +256,6 @@ #define CONFIG_SYS_HZ 1000 /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index ed0a601..6bc1d0a 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -253,13 +253,6 @@ #define CONFIG_SYS_HZ 1000 /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ diff --git a/include/configs/apollon.h b/include/configs/apollon.h index aebca71..83b1818 100644 --- a/include/configs/apollon.h +++ b/include/configs/apollon.h @@ -207,13 +207,6 @@ #define CONFIG_SYS_HZ ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV)) /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE SZ_128K /* regular stack */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 /* CS1 may or may not be populated */ diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 2abcaff..f4e8c90 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -224,7 +224,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_4K \ - GENERATED_GBL_DATA_SIZE) -#define CONFIG_STACKSIZE SZ_32K /* regular stack */ #define CONFIG_STACKSIZE_IRQ SZ_4K /* Unsure if to big or to small*/ #define CONFIG_STACKSIZE_FIQ SZ_4K /* Unsure if to big or to small*/ #endif /* __AT91RM9200EK_CONFIG_H__ */ diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 07b1968..286090e 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -236,8 +236,6 @@ */ #define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) -#define CONFIG_STACKSIZE (32*1024) /* regular stack */ - #ifdef CONFIG_USE_IRQ #error CONFIG_USE_IRQ not supported #endif diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 6fd0b83..825e150 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -238,8 +238,6 @@ */ #define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) -#define CONFIG_STACKSIZE (32*1024) /* regular stack */ - #ifdef CONFIG_USE_IRQ #error CONFIG_USE_IRQ not supported #endif diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 61a622a..fceccd5 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -349,8 +349,6 @@ */ #define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) -#define CONFIG_STACKSIZE (32*1024) /* regular stack */ - #undef CONFIG_USE_IRQ #endif diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index f8b3095..160d6a9 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -193,8 +193,6 @@ */ #define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) -#define CONFIG_STACKSIZE (32*1024) /* regular stack */ - #ifdef CONFIG_USE_IRQ #error CONFIG_USE_IRQ not supported #endif diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 45f8baf..6def83e 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -188,8 +188,6 @@ */ #define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) -#define CONFIG_STACKSIZE (32*1024) /* regular stack */ - #undef CONFIG_USE_IRQ #endif diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h index 97fdc2c..d32fb50 100644 --- a/include/configs/balloon3.h +++ b/include/configs/balloon3.h @@ -104,7 +104,6 @@ /* * Stack sizes */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h index 14b8146..79c178b 100644 --- a/include/configs/ca9x4_ct_vxp.h +++ b/include/configs/ca9x4_ct_vxp.h @@ -106,7 +106,6 @@ #define CONFIG_BOOTDELAY 2 /* Stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4 * 1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4 * 1024) /* FIQ stack */ diff --git a/include/configs/calimain.h b/include/configs/calimain.h index e31e40b..ffc67ec 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -161,7 +161,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (16 << 20)) #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define CONFIG_STACKSIZE (256*1024) /* regular stack */ /* * Serial Driver info diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h index 771ac9c..cfa404f 100644 --- a/include/configs/cam_enc_4xx.h +++ b/include/configs/cam_enc_4xx.h @@ -191,7 +191,6 @@ #define CONFIG_TIMESTAMP /* U-Boot memory configuration */ -#define CONFIG_STACKSIZE (256 << 10) /* 256 KiB */ #define CONFIG_SYS_MALLOC_LEN (1 << 20) /* 1 MiB */ #define CONFIG_SYS_MEMTEST_START 0x80000000 /* physical address */ #define CONFIG_SYS_MEMTEST_END 0x81000000 /* test 16MB RAM */ diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h index 408e918..955ee9f 100644 --- a/include/configs/cm4008.h +++ b/include/configs/cm4008.h @@ -97,10 +97,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h index d85a600..955e6ea 100644 --- a/include/configs/cm41xx.h +++ b/include/configs/cm41xx.h @@ -97,10 +97,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 782d28c..f586ab5 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -278,13 +278,6 @@ #define CONFIG_SYS_HZ 1000 /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 /* CS1 is never populated */ diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 1f02f3f..e2ea909 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -118,10 +118,7 @@ /* * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4 * 1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4 * 1024) /* FIQ stack */ diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h index a877066..fef61b8 100644 --- a/include/configs/cpu9260.h +++ b/include/configs/cpu9260.h @@ -511,8 +511,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 4 * 1024 - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_STACKSIZE (32 * 1024) - #if defined(CONFIG_USE_IRQ) #error CONFIG_USE_IRQ not supported #endif diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h index dc676df..f80a910 100644 --- a/include/configs/cpuat91.h +++ b/include/configs/cpuat91.h @@ -211,7 +211,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 4 * 1024 - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_STACKSIZE (32 * 1024) #define CONFIG_STACKSIZE_IRQ (4 * 1024) #define CONFIG_STACKSIZE_FIQ (4 * 1024) diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h index 51dc664..bb2261d 100644 --- a/include/configs/da830evm.h +++ b/include/configs/da830evm.h @@ -53,7 +53,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ (32 << 20)) #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define CONFIG_STACKSIZE (256*1024) /* regular stack */ /* * Serial Driver info diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index e6adb1f..6c2ef67 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -62,7 +62,6 @@ #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 0x2000000 + 16*1024*1024) #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define CONFIG_STACKSIZE (256*1024) /* regular stack */ #define CONFIG_SYS_DA850_SYSCFG_SUSPSRC ( \ DAVINCI_SYSCFG_SUSPSRC_TIMER0 | \ diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h index a30d24c..0b4f978 100644 --- a/include/configs/davinci_dm355evm.h +++ b/include/configs/davinci_dm355evm.h @@ -170,7 +170,6 @@ #define CONFIG_NET_RETRY_COUNT 10 /* U-Boot memory configuration */ -#define CONFIG_STACKSIZE (256 << 10) /* 256 KiB */ #define CONFIG_SYS_MALLOC_LEN (1 << 20) /* 1 MiB */ #define CONFIG_SYS_MEMTEST_START 0x87000000 /* physical address */ #define CONFIG_SYS_MEMTEST_END 0x88000000 /* test 16MB RAM */ diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h index 1cd3d2e..2abd61f 100644 --- a/include/configs/davinci_dm355leopard.h +++ b/include/configs/davinci_dm355leopard.h @@ -130,7 +130,6 @@ #define CONFIG_NET_RETRY_COUNT 10 /* U-Boot memory configuration */ -#define CONFIG_STACKSIZE (256 << 10) /* 256 KiB */ #define CONFIG_SYS_MALLOC_LEN (1 << 20) /* 1 MiB */ #define CONFIG_SYS_MEMTEST_START 0x87000000 /* physical address */ #define CONFIG_SYS_MEMTEST_END 0x88000000 /* test 16MB RAM */ diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h index bcf10ca..afca4bb 100644 --- a/include/configs/davinci_dm365evm.h +++ b/include/configs/davinci_dm365evm.h @@ -202,7 +202,6 @@ #define CONFIG_TIMESTAMP /* U-Boot memory configuration */ -#define CONFIG_STACKSIZE (256 << 10) /* 256 KiB */ #define CONFIG_SYS_MALLOC_LEN (1 << 20) /* 1 MiB */ #define CONFIG_SYS_MEMTEST_START 0x87000000 /* physical address */ #define CONFIG_SYS_MEMTEST_END 0x88000000 /* test 16MB RAM */ diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h index 6734ea3..0b36c84 100644 --- a/include/configs/davinci_dm6467evm.h +++ b/include/configs/davinci_dm6467evm.h @@ -54,7 +54,6 @@ extern unsigned int davinci_arm_clk_get(void); #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x81000000 /* 16MB RAM test */ #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_STACKSIZE (256 << 10) /* 256 KiB */ #define PHYS_SDRAM_1 0x80000000 /* DDR Start */ #define PHYS_SDRAM_1_SIZE (256 << 20) /* DDR size 256MB */ diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h index e4443ec..b4f7fc4 100644 --- a/include/configs/davinci_dvevm.h +++ b/include/configs/davinci_dvevm.h @@ -74,7 +74,6 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 /* memtest start address */ #define CONFIG_SYS_MEMTEST_END 0x81000000 /* 16MB RAM test */ #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define CONFIG_STACKSIZE (256*1024) /* regular stack */ #define PHYS_SDRAM_1 0x80000000 /* DDR Start */ #define PHYS_SDRAM_1_SIZE 0x10000000 /* DDR size 256MB */ diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h index 93df4ff..5c28fb6 100644 --- a/include/configs/davinci_schmoogie.h +++ b/include/configs/davinci_schmoogie.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 /* memtest start address */ #define CONFIG_SYS_MEMTEST_END 0x81000000 /* 16MB RAM test */ #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define CONFIG_STACKSIZE (256*1024) /* regular stack */ #define PHYS_SDRAM_1 0x80000000 /* DDR Start */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* DDR size 128MB */ #define DDR_4BANKS /* 4-bank DDR2 (128MB) */ diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h index 23b0ba7..6002c25 100644 --- a/include/configs/davinci_sffsdr.h +++ b/include/configs/davinci_sffsdr.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 /* memtest start address */ #define CONFIG_SYS_MEMTEST_END 0x81000000 /* 16MB RAM test */ #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define CONFIG_STACKSIZE (256*1024) /* regular stack */ #define PHYS_SDRAM_1 0x80000000 /* DDR Start */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* DDR size 128MB */ #define DDR_4BANKS /* 4-bank DDR2 (128MB) */ diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h index 36a8c06..bdfe6bb 100644 --- a/include/configs/davinci_sonata.h +++ b/include/configs/davinci_sonata.h @@ -76,7 +76,6 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 /* memtest start address */ #define CONFIG_SYS_MEMTEST_END 0x81000000 /* 16MB RAM test */ #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define CONFIG_STACKSIZE (256*1024) /* regular stack */ #define PHYS_SDRAM_1 0x80000000 /* DDR Start */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* DDR size 128MB */ #define DDR_4BANKS /* 4-bank DDR2 (128MB) */ diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 9f15ffb..18d7374 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -41,7 +41,6 @@ * Memory configurations */ #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_STACKSIZE SZ_32K #define CONFIG_SYS_MALLOC_LEN SZ_1M #define CONFIG_SYS_GBL_DATA_SIZE 128 #define CONFIG_SYS_SDRAM_BASE EMC_DYCS0_BASE diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 037a5bb..647b7b1 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -274,9 +274,6 @@ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ #define CONFIG_SYS_HZ 1000 -/* The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 4845d51..0e6cd94 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -260,10 +260,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4 << 10) /* IRQ stack 4 KiB */ #define CONFIG_STACKSIZE_FIQ (4 << 10) /* FIQ stack 4 KiB */ diff --git a/include/configs/dvlhost.h b/include/configs/dvlhost.h index 4eda91e..dce501a 100644 --- a/include/configs/dvlhost.h +++ b/include/configs/dvlhost.h @@ -106,10 +106,7 @@ /* * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ /* Expansion bus settings */ #define CONFIG_SYS_EXP_CS0 0xbd113442 diff --git a/include/configs/ea20.h b/include/configs/ea20.h index a9caa81..337d504 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -65,7 +65,6 @@ #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 0x2000000 + 16*1024*1024) #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define CONFIG_STACKSIZE (256*1024) /* regular stack */ /* * Serial Driver info diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h index 4d8be2b..d4104de 100644 --- a/include/configs/eb_cpux9k2.h +++ b/include/configs/eb_cpux9k2.h @@ -61,8 +61,6 @@ #define CONFIG_SYS_PBSIZE \ (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */ -#define CONFIG_STACKSIZE (32*1024) /* regular stack */ - /* * ARM asynchronous clock */ diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 6a67aa5..f0fb488 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -228,7 +228,6 @@ #define CONFIG_DISPLAY_CPUINFO /* Display cpu info */ #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_STACKSIZE 0x00100000 #define CONFIG_SYS_LOAD_ADDR 0x00800000 #define CONFIG_SYS_MEMTEST_START 0x00400000 #define CONFIG_SYS_MEMTEST_END 0x007fffff diff --git a/include/configs/efikamx.h b/include/configs/efikamx.h index 143b0f0..439b5f3 100644 --- a/include/configs/efikamx.h +++ b/include/configs/efikamx.h @@ -246,13 +246,6 @@ #define CONFIG_CMDLINE_EDITING /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h index c1a0f6a..9f965b8 100644 --- a/include/configs/enbw_cmc.h +++ b/include/configs/enbw_cmc.h @@ -71,7 +71,6 @@ #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 0x2000000 + 16*1024*1024) #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define CONFIG_STACKSIZE (256*1024) /* regular stack */ /* * Serial Driver info diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index f89e9ea..e1d0268 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -53,8 +53,8 @@ /* 32kB internal SRAM */ #define CONFIG_SRAM_BASE 0x00300000 /*AT91SAM9XE_SRAM_BASE */ #define CONFIG_SRAM_SIZE (32 << 10) -#define CONFIG_STACKSIZE (CONFIG_SRAM_SIZE - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SRAM_BASE + CONFIG_STACKSIZE) +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SRAM_BASE + CONFIG_SRAM_SIZE - \ + GENERATED_GBL_DATA_SIZE) /* 128MB SDRAM in 1 bank */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 6c5fcac..7765d0e 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -147,14 +147,6 @@ #define CONFIG_SYS_HZ 1000 - -/* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - /* * Physical Memory Map */ diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h index c6e8859..36eb32f 100644 --- a/include/configs/hawkboard.h +++ b/include/configs/hawkboard.h @@ -86,7 +86,6 @@ #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 16*1024*1024) #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define CONFIG_STACKSIZE (256*1024) /* regular stack */ /* * Serial Driver info diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 791f3f5..e0abd2f 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -94,10 +94,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h index 88e2e3a..b21ae8a 100644 --- a/include/configs/igep00x0.h +++ b/include/configs/igep00x0.h @@ -225,13 +225,6 @@ #define CONFIG_SYS_HZ 1000 /* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/* * Physical Memory Map * */ diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h index 17fa4a1..567061a 100644 --- a/include/configs/ima3-mx53.h +++ b/include/configs/ima3-mx53.h @@ -133,9 +133,6 @@ #define CONFIG_SYS_HZ 1000 #define CONFIG_CMDLINE_EDITING -/* Stack sizes */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 CSD0_BASE_ADDR diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 7d2876b..b3f382c 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -94,7 +94,6 @@ #define CONFIG_SYS_MEMTEST_START 0xA0000000 #define CONFIG_SYS_MEMTEST_END 0xA1000000 /* 16MB RAM test */ #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define CONFIG_STACKSIZE (256 * 1024) /* regular stack */ #define PHYS_SDRAM_1 0xA0000000 /* DDR Start */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* DDR size 128MB */ diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h index a340e97..8cca478 100644 --- a/include/configs/imx31_litekit.h +++ b/include/configs/imx31_litekit.h @@ -139,13 +139,6 @@ #define CONFIG_CMDLINE_EDITING 1 /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 1728358..b31af9c 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -143,13 +143,6 @@ #define CONFIG_CMDLINE_EDITING /* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/* * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 2252d93..4692834 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -103,10 +103,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index ca2d92d..5542b88 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -114,10 +114,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h index 2badadb..132b598 100644 --- a/include/configs/jadecpu.h +++ b/include/configs/jadecpu.h @@ -204,8 +204,6 @@ #define CONFIG_SYS_MALLOC_LEN (10 << 20) #define CONFIG_SYS_MEM_TOP_HIDE (4 << 20) -#define CONFIG_STACKSIZE (32*1024) /* regular stack */ - /* * Clock reset generator init */ diff --git a/include/configs/jornada.h b/include/configs/jornada.h index 84ad2d8..93cf1fa 100644 --- a/include/configs/jornada.h +++ b/include/configs/jornada.h @@ -88,12 +88,6 @@ #define CONFIG_SYS_CPUSPEED 0x0a /* core clock 206MHz */ #define CONFIG_SYS_BAUDRATE_TABLE { 19200, 38400, 57600, 115200 } -/*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #define CONFIG_SYS_FLASH_CFI 1 #define CONFIG_FLASH_CFI_DRIVER 1 #define CONFIG_FLASH_CFI_WIDTH FLASH_CFI_32BIT diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 011f838..cf0e647 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -151,7 +151,6 @@ #define CONFIG_ARCH_MISC_INIT /* call arch_misc_init() */ #define CONFIG_DISPLAY_CPUINFO /* Display cpu info */ #define CONFIG_NR_DRAM_BANKS 4 -#define CONFIG_STACKSIZE 0x00100000 /* regular stack- 1M */ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ /* diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h index 4b9b290..1384763 100644 --- a/include/configs/lubbock.h +++ b/include/configs/lubbock.h @@ -137,10 +137,7 @@ /* * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 3abaadc..d79af6c 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -88,7 +88,6 @@ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ #define PHYS_SDRAM_1_SIZE 0x20000000 /* Max 512 MB RAM */ -#define CONFIG_STACKSIZE 0x00010000 /* 128 KB stack */ #define CONFIG_SYS_MALLOC_LEN 0x00400000 /* 4 MB for malloc */ #define CONFIG_SYS_GBL_DATA_SIZE 128 /* Initial data */ #define CONFIG_SYS_MEMTEST_START 0x40000000 /* Memtest start adr */ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 970c882..23833eb 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -253,13 +253,6 @@ #define CONFIG_SYS_HZ 1000 /* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/* * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 1e897e2..46d970d 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -221,8 +221,6 @@ #define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + \ 128*1024, 0x1000) -#define CONFIG_STACKSIZE (32 * 1024) /* regular stack */ - #ifdef CONFIG_USE_IRQ # error CONFIG_USE_IRQ not supported #endif diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 27b4899..7086d1d 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -105,7 +105,6 @@ #define CONFIG_ARCH_MISC_INIT /* call arch_misc_init() */ #define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */ #define CONFIG_DISPLAY_CPUINFO /* Display cpu info */ -#define CONFIG_STACKSIZE 0x00100000 /* regular stack- 1M */ #define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */ #define CONFIG_SYS_MEMTEST_START 0x00800000 /* 8M */ #define CONFIG_SYS_MEMTEST_END 0x00ffffff /*(_16M -1) */ diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h index 665e33d..c32d5a8 100644 --- a/include/configs/mx1ads.h +++ b/include/configs/mx1ads.h @@ -134,10 +134,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index efca287..359a308 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -49,9 +49,6 @@ #define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE/2) #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE) -/* Stack sizes */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - /* Serial Info */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 51b172d..ef68eaa 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -76,7 +76,6 @@ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* Max 1 GB RAM */ -#define CONFIG_STACKSIZE (128 * 1024) /* 128 KB stack */ #define CONFIG_SYS_MALLOC_LEN 0x00400000 /* 4 MB for malloc */ #define CONFIG_SYS_MEMTEST_START 0x40000000 /* Memtest start adr */ #define CONFIG_SYS_MEMTEST_END 0x40400000 /* 4 MB RAM test */ diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index cc720e8..081fbf6 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -155,13 +155,6 @@ #define CONFIG_CMDLINE_EDITING 1 /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 7634de7..17d3143 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -151,13 +151,6 @@ #define CONFIG_CMDLINE_EDITING /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 016864a..52a4bea 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -162,14 +162,6 @@ #define CONFIG_SYS_HZ 1000 - -/* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - /* * Physical Memory Map */ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index bd04c02..0c71543 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -216,13 +216,6 @@ #define CONFIG_CMDLINE_EDITING /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index f4512ff..490513f 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -156,9 +156,6 @@ #define CONFIG_SYS_HZ 1000 #define CONFIG_CMDLINE_EDITING -/* Stack sizes */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index a5f32e3..17d5793 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -166,9 +166,6 @@ #define CONFIG_SYS_HZ 1000 #define CONFIG_CMDLINE_EDITING -/* Stack sizes */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 CSD0_BASE_ADDR diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 8b4e008..027bd27 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -178,9 +178,6 @@ #define CONFIG_SYS_HZ 1000 #define CONFIG_CMDLINE_EDITING -/* Stack sizes */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index 0d7086d..bf539c6 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -154,9 +154,6 @@ #define CONFIG_SYS_HZ 1000 #define CONFIG_CMDLINE_EDITING -/* Stack sizes */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index a155c77..78e114a 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -141,7 +141,6 @@ #define CONFIG_SYS_HZ 1000 #define CONFIG_CMDLINE_EDITING -#define CONFIG_STACKSIZE (128 * 1024) /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h index 5b566a8..00920b9 100644 --- a/include/configs/mx6qsabrelite.h +++ b/include/configs/mx6qsabrelite.h @@ -188,7 +188,6 @@ #define CONFIG_SYS_HZ 1000 #define CONFIG_CMDLINE_EDITING -#define CONFIG_STACKSIZE (128 * 1024) /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h index 37a66ab..d8ef86e 100644 --- a/include/configs/nhk8815.h +++ b/include/configs/nhk8815.h @@ -85,7 +85,6 @@ #define CONFIG_SYS_TEXT_BASE 0x00000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + (1<<20)) -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ #ifdef CONFIG_USE_IRQ # define CONFIG_STACKSIZE_IRQ (4 * 1024) /* IRQ stack */ # define CONFIG_STACKSIZE_FIQ (4 * 1024) /* FIQ stack */ diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h index f465a56..c530c38 100644 --- a/include/configs/ns9750dev.h +++ b/include/configs/ns9750dev.h @@ -126,10 +126,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h index f591a86..d35f162 100644 --- a/include/configs/omap1510inn.h +++ b/include/configs/omap1510inn.h @@ -138,10 +138,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h index 13762cc..9ef5f53 100644 --- a/include/configs/omap2420h4.h +++ b/include/configs/omap2420h4.h @@ -194,10 +194,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE SZ_128K /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ SZ_4K /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ SZ_4K /* FIQ stack */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 268215c..d00b7d7 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -342,13 +342,6 @@ #define CONFIG_SYS_HZ 1000 /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index 20192a9..f25e8dc 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -52,12 +52,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) /* - * Stack sizes - * These values are used in start.S - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/* * Physical Memory Map * Note 1: CS1 may or may not be populated * Note 2: SDRAM size is expected to be at least 32MB diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 2e1e6b9..730c29c 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -286,13 +286,6 @@ #define CONFIG_SYS_HZ 1000 /* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/* * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index 6a13046..19a7512 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -247,13 +247,6 @@ #define CONFIG_SYS_HZ 1000 /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index d29b326..a9acb01 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -231,13 +231,6 @@ #define CONFIG_SYS_HZ 1000 /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 604b53d..6bef148 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -217,13 +217,6 @@ #define CONFIG_SYS_HZ 1000 /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index 1d8b0ab..3730204 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -293,13 +293,6 @@ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ #define CONFIG_SYS_HZ 1000 -/* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* Regular stack */ - #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800 #define CONFIG_SYS_INIT_RAM_SIZE 0x800 diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 0f72ebe..70b8805 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -249,13 +249,6 @@ #define CONFIG_SYS_HZ 1000 /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index b60ece3..eaf499a 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -218,13 +218,6 @@ #define CONFIG_SYS_HZ ((V_SCLK) / (2 << CONFIG_SYS_PTV)) /*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using these settings - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/*----------------------------------------------------------------------- * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index 8448142..88b46c9 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h @@ -210,10 +210,7 @@ /* * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128 << 10) /* Regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4 << 10) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4 << 10) /* FIQ stack */ diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h index 639d4a3..33e8fb0 100644 --- a/include/configs/omap5912osk.h +++ b/include/configs/omap5912osk.h @@ -140,10 +140,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/omap5_evm.h b/include/configs/omap5_evm.h index 60c7a29..68a3978 100644 --- a/include/configs/omap5_evm.h +++ b/include/configs/omap5_evm.h @@ -212,10 +212,7 @@ /* * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128 << 10) /* Regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4 << 10) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4 << 10) /* FIQ stack */ diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h index f1cadb2..21b8778 100644 --- a/include/configs/omap730p2.h +++ b/include/configs/omap730p2.h @@ -149,11 +149,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ - -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/origen.h b/include/configs/origen.h index 172bf14..9784fe8 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -116,9 +116,6 @@ #define CONFIG_SYS_HZ 1000 -/* Stack sizes */ -#define CONFIG_STACKSIZE (256 << 10) /* 256KB */ - /* ORIGEN has 4 bank of DRAM */ #define CONFIG_NR_DRAM_BANKS 4 #define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */ diff --git a/include/configs/otc570.h b/include/configs/otc570.h index 7abc42a..1cfd1d9 100644 --- a/include/configs/otc570.h +++ b/include/configs/otc570.h @@ -274,8 +274,6 @@ #define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + \ 128*1024, 0x1000) -#define CONFIG_STACKSIZE (32 * 1024) /* regular stack */ - #ifdef CONFIG_USE_IRQ # error CONFIG_USE_IRQ not supported #endif diff --git a/include/configs/palmld.h b/include/configs/palmld.h index 70b794d..bcaaa3b 100644 --- a/include/configs/palmld.h +++ b/include/configs/palmld.h @@ -132,7 +132,6 @@ /* * Stack sizes */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h index 7cf2c63..6d91f27 100644 --- a/include/configs/palmtc.h +++ b/include/configs/palmtc.h @@ -133,7 +133,6 @@ /* * Stack sizes */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h index 19b80d1..633e6d3 100644 --- a/include/configs/pdnb3.h +++ b/include/configs/pdnb3.h @@ -120,10 +120,7 @@ /* * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index cdb3593..25ef5a6 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -380,8 +380,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_STACKSIZE (32 * 1024) /* regular stack */ - #ifdef CONFIG_USE_IRQ #error CONFIG_USE_IRQ not supported #endif diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index d202d0a..e528780 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -412,8 +412,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_STACKSIZE (32 * 1024) /* regular stack */ - #ifdef CONFIG_USE_IRQ #error CONFIG_USE_IRQ not supported #endif diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index c766330..7eed387 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -188,8 +188,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_STACKSIZE (32*1024) /* regular stack */ - #ifdef CONFIG_USE_IRQ #error CONFIG_USE_IRQ not supported #endif diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h index f143ed0..63e2688 100644 --- a/include/configs/pxa255_idp.h +++ b/include/configs/pxa255_idp.h @@ -253,10 +253,7 @@ /* * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/qong.h b/include/configs/qong.h index e824e17..485e1b1 100644 --- a/include/configs/qong.h +++ b/include/configs/qong.h @@ -212,12 +212,6 @@ #define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */ #define CONFIG_MISC_INIT_R -/*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ /*----------------------------------------------------------------------- * Physical Memory Map diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 16be764..36f1a57 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -189,9 +189,6 @@ #define CONFIG_SYS_HZ 1000 -/* Stack sizes */ -#define CONFIG_STACKSIZE (256 << 10) /* 256 KiB */ - /* Goni has 3 banks of DRAM, but swap the bank */ #define CONFIG_NR_DRAM_BANKS 3 #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE /* OneDRAM Bank #0 */ diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 721301f..7727624 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -214,9 +214,6 @@ #define CONFIG_SYS_HZ 1000 -/* Stack sizes */ -#define CONFIG_STACKSIZE (256 << 10) /* regular stack 256KB */ - /* Universal has 2 banks of DRAM */ #define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE /* LDDDR2 DMC 0 */ diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h index 316e3fb..19807f9 100644 --- a/include/configs/sbc35_a9g20.h +++ b/include/configs/sbc35_a9g20.h @@ -182,7 +182,6 @@ * Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128 * 1024, 0x1000) -#define CONFIG_STACKSIZE (32 * 1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #error CONFIG_USE_IRQ not supported diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h index 1494a2e..bf38afd 100644 --- a/include/configs/scb9328.h +++ b/include/configs/scb9328.h @@ -100,8 +100,6 @@ */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) ) -#define CONFIG_STACKSIZE (120<<10) /* stack size */ - #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4<<10) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4<<10) /* FIQ stack */ diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h index 8792c85..5bf1a4c 100644 --- a/include/configs/smdk2410.h +++ b/include/configs/smdk2410.h @@ -150,10 +150,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index 2360a8f..dfd9db0 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -127,9 +127,6 @@ #define CONFIG_RD_LVL -/* Stack sizes */ -#define CONFIG_STACKSIZE (256 << 10) /* 256KB */ - #define CONFIG_NR_DRAM_BANKS 8 #define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */ #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h index 04caeef..d4dc8ef 100644 --- a/include/configs/smdk6400.h +++ b/include/configs/smdk6400.h @@ -141,13 +141,6 @@ #define CONFIG_SYS_HZ 1000 -/*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE 0x40000 /* regular stack 256KB */ - /********************************** Support Clock Settings ********************************** diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index fd9f96d..22de344 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -182,13 +182,6 @@ #define CONFIG_SYS_HZ 1000 -/*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (256 << 10) /* 256 KiB */ - /* SMDKC100 has 1 banks of DRAM, we use only one in U-Boot */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE /* SDRAM Bank #1 */ diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index 41d7780..492cf4b 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -115,9 +115,6 @@ #define CONFIG_SYS_HZ 1000 -/* Stack sizes */ -#define CONFIG_STACKSIZE (256 << 10) /* 256KB */ - /* SMDKV310 has 4 bank of DRAM */ #define CONFIG_NR_DRAM_BANKS 4 #define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */ diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 8af3c02..f470edd 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -162,7 +162,6 @@ /* U-Boot memory settings */ #define CONFIG_SYS_MALLOC_LEN (1 << 20) -#define CONFIG_STACKSIZE (256 << 10) /* Command line configuration */ #include <config_cmd_default.h> diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index ab1b332..e534c1d 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -199,9 +199,6 @@ #define CONFIG_EXTRA_ENV_SETTINGS CONFIG_EXTRA_ENV_USBTTY -/* Stack sizes */ -#define CONFIG_STACKSIZE (128*1024) - #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) #define CONFIG_STACKSIZE_FIQ (4*1024) diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 777f77c..1cbe511 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -183,12 +183,6 @@ #define CONFIG_SYS_HZ 1000 /* - * Stack sizes - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/* * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h index 52dc38e..3a77a21 100644 --- a/include/configs/tegra2-common.h +++ b/include/configs/tegra2-common.h @@ -172,13 +172,7 @@ #define CONFIG_SYS_LOAD_ADDR (0xA00800) /* default */ #define CONFIG_SYS_HZ 1000 -/*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ #define CONFIG_STACKBASE 0x2800000 /* 40MB */ -#define CONFIG_STACKSIZE 0x20000 /* 128K regular stack*/ /*----------------------------------------------------------------------- * Physical Memory Map diff --git a/include/configs/tnetv107x_evm.h b/include/configs/tnetv107x_evm.h index 2272ad2..23cab88 100644 --- a/include/configs/tnetv107x_evm.h +++ b/include/configs/tnetv107x_evm.h @@ -55,7 +55,6 @@ #define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1 #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 16*1024*1024) #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_STACKSIZE (256*1024) #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_RAM_SIZE 0x1000 diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h index def5306..a1343f4 100644 --- a/include/configs/tny_a9260.h +++ b/include/configs/tny_a9260.h @@ -166,8 +166,6 @@ */ #define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128 * 1024, 0x1000) -#define CONFIG_STACKSIZE (32 * 1024) /* regular stack */ - #ifdef CONFIG_USE_IRQ #error CONFIG_USE_IRQ not supported #endif diff --git a/include/configs/top9000.h b/include/configs/top9000.h index 1a5f680..b8f6ca0 100644 --- a/include/configs/top9000.h +++ b/include/configs/top9000.h @@ -303,7 +303,6 @@ extern void read_factory_r(void); /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN \ ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) -#define CONFIG_STACKSIZE (32*1024) #ifdef CONFIG_USE_IRQ #error CONFIG_USE_IRQ not supported #endif diff --git a/include/configs/trats.h b/include/configs/trats.h index d2dfc9f..cadb1e9 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -165,9 +165,6 @@ #define CONFIG_SYS_HZ 1000 -/* Stack sizes */ -#define CONFIG_STACKSIZE (256 << 10) /* regular stack 256KB */ - /* TRATS has 2 banks of DRAM */ #define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE /* LDDDR2 DMC 0 */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 56336ae..db94442 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -245,9 +245,6 @@ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ #define CONFIG_SYS_HZ 1000 -/* The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h index b4ec8f0..c61e888 100644 --- a/include/configs/trizepsiv.h +++ b/include/configs/trizepsiv.h @@ -179,10 +179,7 @@ /* * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/tt01.h b/include/configs/tt01.h index 2b2e7fd..cc68a42 100644 --- a/include/configs/tt01.h +++ b/include/configs/tt01.h @@ -86,9 +86,6 @@ /* default load address, 1MB up the road */ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1+0x100000) -/* The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - /* Size of malloc() pool, make sure possible frame buffer fits */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 10*1024*1024) diff --git a/include/configs/tx25.h b/include/configs/tx25.h index 6821528..c8a49bb 100644 --- a/include/configs/tx25.h +++ b/include/configs/tx25.h @@ -84,7 +84,6 @@ /* 8MB DRAM test */ #define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1 #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1+0x0800000) -#define CONFIG_STACKSIZE (256 * 1024) /* regular stack */ /* * Serial Info diff --git a/include/configs/vct.h b/include/configs/vct.h index 0a5ce64..b4b0949 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) -#define CONFIG_STACKSIZE (256 << 10) #define CONFIG_SYS_MALLOC_LEN (1 << 20) #define CONFIG_SYS_BOOTPARAMS_LEN (128 << 10) #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 diff --git a/include/configs/versatile.h b/include/configs/versatile.h index ff23a92..e8ab2bc 100644 --- a/include/configs/versatile.h +++ b/include/configs/versatile.h @@ -146,10 +146,7 @@ /*----------------------------------------------------------------------- * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4 * 1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4 * 1024) /* FIQ stack */ diff --git a/include/configs/vision2.h b/include/configs/vision2.h index 24905a0..bb161ff 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -178,11 +178,6 @@ #define CONFIG_SYS_HUSH_PARSER /* - * Stack sizes - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/* * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h index 01f0b6c..ca0ba07 100644 --- a/include/configs/vpac270.h +++ b/include/configs/vpac270.h @@ -168,7 +168,6 @@ /* * Stack sizes */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h index 0ed3bf4..e7f3d10 100644 --- a/include/configs/xaeniax.h +++ b/include/configs/xaeniax.h @@ -183,10 +183,7 @@ /* * Stack sizes - * - * The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index a330bd0..86abb01 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -155,7 +155,6 @@ unsigned char zipitz2_spi_read(void); /* * Stack sizes */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #ifdef CONFIG_USE_IRQ #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index c9f737d..072945a 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -171,6 +171,5 @@ * Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (0x400000 - 0x8000) -#define CONFIG_STACKSIZE (32*1024) /* regular stack */ #endif /* __CONFIG_H */ -- 1.7.9.5

2 4

[U-Boot] [PATCH 1/2] NET: NE2000: Cleanup IO accessors
by Marek Vasut 13 Jul '12

13 Jul '12

Introduce ne2k_register_io(in, out), which allows user to supply two functions. One for reading data from the card, the other for writing data to the card. Then introduce drivers' private data, which carry pointers to these functions and are passed throughout the driver. The private data will carry more entries later. Signed-off-by: Marek Vasut <marek.vasut(a)gmail.com> --- drivers/net/ne2000_base.c | 318 +++++++++++++++++++++++++++------------------ include/netdev.h | 2 + 2 files changed, 191 insertions(+), 129 deletions(-) NOTE: Formating not cleaned up, only relevant change made! diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c index 88f2b37..35a8581 100644 --- a/drivers/net/ne2000_base.c +++ b/drivers/net/ne2000_base.c @@ -76,10 +76,7 @@ Add SNMP #include <command.h> #include <net.h> #include <malloc.h> - -/* forward definition of function used for the uboot interface */ -void uboot_push_packet_len(int len); -void uboot_push_tx_done(int key, int val); +#include <errno.h> /* NE2000 base header file */ #include "ne2000_base.h" @@ -94,12 +91,37 @@ void uboot_push_tx_done(int key, int val); static dp83902a_priv_data_t nic; /* just one instance of the card supported */ +uint32_t ne2k_default_in(uint8_t *addr, uint32_t offset) +{ + uint32_t ret; + DP_IN(addr, offset, ret); + return ret; +} + +void ne2k_default_out(uint8_t *addr, uint32_t offset, uint32_t val) +{ + DP_OUT(addr, offset, val); +} + +struct ne2k_io_accessors { + uint32_t (*in)(uint8_t *addr, uint32_t offset); + void (*out)(uint8_t *addr, uint32_t offset, uint32_t val); +}; + +struct ne2k_private_data { + struct ne2k_io_accessors io; +}; + +/* forward definition of function used for the uboot interface */ +void uboot_push_packet_len(struct ne2k_private_data *pdata, int len); +void uboot_push_tx_done(int key, int val); + /** * This function reads the MAC address from the serial EEPROM, * used if PROM read fails. Does nothing for ax88796 chips (sh boards) */ static bool -dp83902a_init(unsigned char *enetaddr) +dp83902a_init(struct eth_device *dev) { dp83902a_priv_data_t *dp = &nic; u8* base; @@ -116,13 +138,17 @@ dp83902a_init(unsigned char *enetaddr) DEBUG_LINE(); #if defined(NE2000_BASIC_INIT) + unsigned char *enetaddr = dev->enetaddr; + struct ne2k_private_data *pdata = dev->priv; + const struct ne2k_io_accessors *io = &pdata->io; + /* AX88796L doesn't need */ /* Prepare ESA */ - DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE1); /* Select page 1 */ + io->out(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE1); /* Select page 1 */ /* Use the address from the serial EEPROM */ for (i = 0; i < 6; i++) - DP_IN(base, DP_P1_PAR0+i, dp->esa[i]); - DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE0); /* Select page 0 */ + dp->esa[i] = io->in(base, DP_P1_PAR0+i); + io->out(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE0); /* Select page 0 */ printf("NE2000 - %s ESA: %02x:%02x:%02x:%02x:%02x:%02x\n", "eeprom", @@ -139,16 +165,18 @@ dp83902a_init(unsigned char *enetaddr) } static void -dp83902a_stop(void) +dp83902a_stop(struct eth_device *dev) { dp83902a_priv_data_t *dp = &nic; + struct ne2k_private_data *pdata = dev->priv; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; DEBUG_FUNCTION(); - DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_STOP); /* Brutal */ - DP_OUT(base, DP_ISR, 0xFF); /* Clear any pending interrupts */ - DP_OUT(base, DP_IMR, 0x00); /* Disable all interrupts */ + io->out(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_STOP); /* Brutal */ + io->out(base, DP_ISR, 0xFF); /* Clear any pending interrupts */ + io->out(base, DP_IMR, 0x00); /* Disable all interrupts */ dp->running = false; } @@ -160,9 +188,12 @@ dp83902a_stop(void) * the hardware ready to send/receive packets. */ static void -dp83902a_start(u8 * enaddr) +dp83902a_start(struct eth_device *dev) { dp83902a_priv_data_t *dp = &nic; + unsigned char *enaddr = dev->enetaddr; + struct ne2k_private_data *pdata = dev->priv; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; int i; @@ -170,37 +201,37 @@ dp83902a_start(u8 * enaddr) DEBUG_FUNCTION(); - DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_STOP); /* Brutal */ - DP_OUT(base, DP_DCR, DP_DCR_INIT); - DP_OUT(base, DP_RBCH, 0); /* Remote byte count */ - DP_OUT(base, DP_RBCL, 0); - DP_OUT(base, DP_RCR, DP_RCR_MON); /* Accept no packets */ - DP_OUT(base, DP_TCR, DP_TCR_LOCAL); /* Transmitter [virtually] off */ - DP_OUT(base, DP_TPSR, dp->tx_buf1); /* Transmitter start page */ + io->out(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_STOP); /* Brutal */ + io->out(base, DP_DCR, DP_DCR_INIT); + io->out(base, DP_RBCH, 0); /* Remote byte count */ + io->out(base, DP_RBCL, 0); + io->out(base, DP_RCR, DP_RCR_MON); /* Accept no packets */ + io->out(base, DP_TCR, DP_TCR_LOCAL); /* Transmitter [virtually] off */ + io->out(base, DP_TPSR, dp->tx_buf1); /* Transmitter start page */ dp->tx1 = dp->tx2 = 0; dp->tx_next = dp->tx_buf1; dp->tx_started = false; dp->running = true; - DP_OUT(base, DP_PSTART, dp->rx_buf_start); /* Receive ring start page */ - DP_OUT(base, DP_BNDRY, dp->rx_buf_end - 1); /* Receive ring boundary */ - DP_OUT(base, DP_PSTOP, dp->rx_buf_end); /* Receive ring end page */ + io->out(base, DP_PSTART, dp->rx_buf_start); /* Receive ring start page */ + io->out(base, DP_BNDRY, dp->rx_buf_end - 1); /* Receive ring boundary */ + io->out(base, DP_PSTOP, dp->rx_buf_end); /* Receive ring end page */ dp->rx_next = dp->rx_buf_start - 1; dp->running = true; - DP_OUT(base, DP_ISR, 0xFF); /* Clear any pending interrupts */ - DP_OUT(base, DP_IMR, DP_IMR_All); /* Enable all interrupts */ - DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE1 | DP_CR_STOP); /* Select page 1 */ - DP_OUT(base, DP_P1_CURP, dp->rx_buf_start); /* Current page - next free page for Rx */ + io->out(base, DP_ISR, 0xFF); /* Clear any pending interrupts */ + io->out(base, DP_IMR, DP_IMR_All); /* Enable all interrupts */ + io->out(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE1 | DP_CR_STOP); /* Select page 1 */ + io->out(base, DP_P1_CURP, dp->rx_buf_start); /* Current page - next free page for Rx */ dp->running = true; for (i = 0; i < ETHER_ADDR_LEN; i++) { /* FIXME */ /*((vu_short*)( base + ((DP_P1_PAR0 + i) * 2) + * 0x1400)) = enaddr[i];*/ - DP_OUT(base, DP_P1_PAR0+i, enaddr[i]); + io->out(base, DP_P1_PAR0+i, enaddr[i]); } /* Enable and start device */ - DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); - DP_OUT(base, DP_TCR, DP_TCR_NORMAL); /* Normal transmit operations */ - DP_OUT(base, DP_RCR, DP_RCR_AB); /* Accept broadcast, no errors, no multicast */ + io->out(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); + io->out(base, DP_TCR, DP_TCR_NORMAL); /* Normal transmit operations */ + io->out(base, DP_RCR, DP_RCR_AB); /* Accept broadcast, no errors, no multicast */ dp->running = true; } @@ -211,9 +242,10 @@ dp83902a_start(u8 * enaddr) */ static void -dp83902a_start_xmit(int start_page, int len) +dp83902a_start_xmit(struct ne2k_private_data *pdata, int start_page, int len) { dp83902a_priv_data_t *dp = (dp83902a_priv_data_t *) &nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; DEBUG_FUNCTION(); @@ -224,12 +256,12 @@ dp83902a_start_xmit(int start_page, int len) printf("TX already started?!?\n"); #endif - DP_OUT(base, DP_ISR, (DP_ISR_TxP | DP_ISR_TxE)); - DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); - DP_OUT(base, DP_TBCL, len & 0xFF); - DP_OUT(base, DP_TBCH, len >> 8); - DP_OUT(base, DP_TPSR, start_page); - DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_TXPKT | DP_CR_START); + io->out(base, DP_ISR, (DP_ISR_TxP | DP_ISR_TxE)); + io->out(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); + io->out(base, DP_TBCL, len & 0xFF); + io->out(base, DP_TBCH, len >> 8); + io->out(base, DP_TPSR, start_page); + io->out(base, DP_CR, DP_CR_NODMA | DP_CR_TXPKT | DP_CR_START); dp->tx_started = true; } @@ -239,9 +271,10 @@ dp83902a_start_xmit(int start_page, int len) * that there is free buffer space (dp->tx_next). */ static void -dp83902a_send(u8 *data, int total_len, u32 key) +dp83902a_send(struct ne2k_private_data *pdata, u8 *data, int total_len, u32 key) { struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; int len, start_page, pkt_len, i, isr; #if DEBUG & 4 @@ -271,7 +304,7 @@ dp83902a_send(u8 *data, int total_len, u32 key) printf("TX prep page %d len %d\n", start_page, pkt_len); #endif - DP_OUT(base, DP_ISR, DP_ISR_RDC); /* Clear end of DMA */ + io->out(base, DP_ISR, DP_ISR_RDC); /* Clear end of DMA */ { /* * Dummy read. The manual sez something slightly different, @@ -279,15 +312,14 @@ dp83902a_send(u8 *data, int total_len, u32 key) * does (i.e., also read data). */ - u16 tmp; int len = 1; - DP_OUT(base, DP_RSAL, 0x100 - len); - DP_OUT(base, DP_RSAH, (start_page - 1) & 0xff); - DP_OUT(base, DP_RBCL, len); - DP_OUT(base, DP_RBCH, 0); - DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_RDMA | DP_CR_START); - DP_IN_DATA(dp->data, tmp); + io->out(base, DP_RSAL, 0x100 - len); + io->out(base, DP_RSAH, (start_page - 1) & 0xff); + io->out(base, DP_RBCL, len); + io->out(base, DP_RBCH, 0); + io->out(base, DP_CR, DP_CR_PAGE0 | DP_CR_RDMA | DP_CR_START); + io->in(dp->data, 0); } #ifdef CYGHWR_NS_DP83902A_PLF_BROKEN_TX_DMA @@ -299,11 +331,11 @@ dp83902a_send(u8 *data, int total_len, u32 key) #endif /* Send data to device buffer(s) */ - DP_OUT(base, DP_RSAL, 0); - DP_OUT(base, DP_RSAH, start_page); - DP_OUT(base, DP_RBCL, pkt_len & 0xFF); - DP_OUT(base, DP_RBCH, pkt_len >> 8); - DP_OUT(base, DP_CR, DP_CR_WDMA | DP_CR_START); + io->out(base, DP_RSAL, 0); + io->out(base, DP_RSAH, start_page); + io->out(base, DP_RBCL, pkt_len & 0xFF); + io->out(base, DP_RBCH, pkt_len >> 8); + io->out(base, DP_CR, DP_CR_WDMA | DP_CR_START); /* Put data into buffer */ #if DEBUG & 4 @@ -316,7 +348,7 @@ dp83902a_send(u8 *data, int total_len, u32 key) if (0 == (++dx % 16)) printf("\n "); #endif - DP_OUT_DATA(dp->data, *data++); + io->out(dp->data, 0, *data++); len--; } #if DEBUG & 4 @@ -329,7 +361,7 @@ dp83902a_send(u8 *data, int total_len, u32 key) /* Padding to 802.3 length was required */ for (i = total_len; i < pkt_len;) { i++; - DP_OUT_DATA(dp->data, 0); + io->out(dp->data, 0, 0); } } @@ -344,11 +376,11 @@ dp83902a_send(u8 *data, int total_len, u32 key) /* Wait for DMA to complete */ do { - DP_IN(base, DP_ISR, isr); + isr = io->in(base, DP_ISR); } while ((isr & DP_ISR_RDC) == 0); /* Then disable DMA */ - DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); + io->out(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); /* Start transmit if not already going */ if (!dp->tx_started) { @@ -357,7 +389,7 @@ dp83902a_send(u8 *data, int total_len, u32 key) } else { dp->tx_int = 2; /* Expecting interrupt from BUF2 */ } - dp83902a_start_xmit(start_page, pkt_len); + dp83902a_start_xmit(pdata, start_page, pkt_len); } } @@ -369,23 +401,23 @@ dp83902a_send(u8 *data, int total_len, u32 key) * 'dp83902a_recv' will be called to actually fetch it from the hardware. */ static void -dp83902a_RxEvent(void) +dp83902a_RxEvent(struct ne2k_private_data *pdata) { struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; - u8 rsr; u8 rcv_hdr[4]; int i, len, pkt, cur; DEBUG_FUNCTION(); - DP_IN(base, DP_RSR, rsr); + io->in(base, DP_RSR); while (true) { /* Read incoming packet header */ - DP_OUT(base, DP_CR, DP_CR_PAGE1 | DP_CR_NODMA | DP_CR_START); - DP_IN(base, DP_P1_CURP, cur); - DP_OUT(base, DP_P1_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); - DP_IN(base, DP_BNDRY, pkt); + io->out(base, DP_CR, DP_CR_PAGE1 | DP_CR_NODMA | DP_CR_START); + cur = io->in(base, DP_P1_CURP); + io->out(base, DP_P1_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); + pkt = io->in(base, DP_BNDRY); pkt += 1; if (pkt == dp->rx_buf_end) @@ -394,27 +426,27 @@ dp83902a_RxEvent(void) if (pkt == cur) { break; } - DP_OUT(base, DP_RBCL, sizeof(rcv_hdr)); - DP_OUT(base, DP_RBCH, 0); - DP_OUT(base, DP_RSAL, 0); - DP_OUT(base, DP_RSAH, pkt); + io->out(base, DP_RBCL, sizeof(rcv_hdr)); + io->out(base, DP_RBCH, 0); + io->out(base, DP_RSAL, 0); + io->out(base, DP_RSAH, pkt); if (dp->rx_next == pkt) { if (cur == dp->rx_buf_start) - DP_OUT(base, DP_BNDRY, dp->rx_buf_end - 1); + io->out(base, DP_BNDRY, dp->rx_buf_end - 1); else - DP_OUT(base, DP_BNDRY, cur - 1); /* Update pointer */ + io->out(base, DP_BNDRY, cur - 1); /* Update pointer */ return; } dp->rx_next = pkt; - DP_OUT(base, DP_ISR, DP_ISR_RDC); /* Clear end of DMA */ - DP_OUT(base, DP_CR, DP_CR_RDMA | DP_CR_START); + io->out(base, DP_ISR, DP_ISR_RDC); /* Clear end of DMA */ + io->out(base, DP_CR, DP_CR_RDMA | DP_CR_START); #ifdef CYGHWR_NS_DP83902A_PLF_BROKEN_RX_DMA CYGACC_CALL_IF_DELAY_US(10); #endif /* read header (get data size)*/ for (i = 0; i < sizeof(rcv_hdr);) { - DP_IN_DATA(dp->data, rcv_hdr[i++]); + rcv_hdr[i++] = io->in(dp->data, 0); } #if DEBUG & 5 @@ -424,12 +456,12 @@ dp83902a_RxEvent(void) len = ((rcv_hdr[3] << 8) | rcv_hdr[2]) - sizeof(rcv_hdr); /* data read */ - uboot_push_packet_len(len); + uboot_push_packet_len(pdata, len); if (rcv_hdr[1] == dp->rx_buf_start) - DP_OUT(base, DP_BNDRY, dp->rx_buf_end - 1); + io->out(base, DP_BNDRY, dp->rx_buf_end - 1); else - DP_OUT(base, DP_BNDRY, rcv_hdr[1] - 1); /* Update pointer */ + io->out(base, DP_BNDRY, rcv_hdr[1] - 1); /* Update pointer */ } } @@ -441,9 +473,10 @@ dp83902a_RxEvent(void) * efficient processing in the upper layers of the stack. */ static void -dp83902a_recv(u8 *data, int len) +dp83902a_recv(struct ne2k_private_data *pdata, u8 *data, int len) { struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; int i, mlen; u8 saved_char = 0; @@ -459,13 +492,13 @@ dp83902a_recv(u8 *data, int len) #endif /* Read incoming packet data */ - DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); - DP_OUT(base, DP_RBCL, len & 0xFF); - DP_OUT(base, DP_RBCH, len >> 8); - DP_OUT(base, DP_RSAL, 4); /* Past header */ - DP_OUT(base, DP_RSAH, dp->rx_next); - DP_OUT(base, DP_ISR, DP_ISR_RDC); /* Clear end of DMA */ - DP_OUT(base, DP_CR, DP_CR_RDMA | DP_CR_START); + io->out(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); + io->out(base, DP_RBCL, len & 0xFF); + io->out(base, DP_RBCH, len >> 8); + io->out(base, DP_RSAL, 4); /* Past header */ + io->out(base, DP_RSAH, dp->rx_next); + io->out(base, DP_ISR, DP_ISR_RDC); /* Clear end of DMA */ + io->out(base, DP_CR, DP_CR_RDMA | DP_CR_START); #ifdef CYGHWR_NS_DP83902A_PLF_BROKEN_RX_DMA CYGACC_CALL_IF_DELAY_US(10); #endif @@ -489,7 +522,7 @@ dp83902a_recv(u8 *data, int len) { u8 tmp; - DP_IN_DATA(dp->data, tmp); + tmp = io->in(dp->data, 0); #if DEBUG & 4 printf(" %02x", tmp); if (0 == (++dx % 16)) printf("\n "); @@ -506,16 +539,16 @@ dp83902a_recv(u8 *data, int len) } static void -dp83902a_TxEvent(void) +dp83902a_TxEvent(struct ne2k_private_data *pdata) { struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; - u8 tsr; u32 key; DEBUG_FUNCTION(); - DP_IN(base, DP_TSR, tsr); + io->in(base, DP_TSR); if (dp->tx_int == 1) { key = dp->tx1_key; dp->tx1 = 0; @@ -526,10 +559,10 @@ dp83902a_TxEvent(void) /* Start next packet if one is ready */ dp->tx_started = false; if (dp->tx1) { - dp83902a_start_xmit(dp->tx1, dp->tx1_len); + dp83902a_start_xmit(pdata, dp->tx1, dp->tx1_len); dp->tx_int = 1; } else if (dp->tx2) { - dp83902a_start_xmit(dp->tx2, dp->tx2_len); + dp83902a_start_xmit(pdata, dp->tx2, dp->tx2_len); dp->tx_int = 2; } else { dp->tx_int = 0; @@ -543,16 +576,16 @@ dp83902a_TxEvent(void) * interrupt. */ static void -dp83902a_ClearCounters(void) +dp83902a_ClearCounters(struct ne2k_private_data *pdata) { struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; - u8 cnt1, cnt2, cnt3; - DP_IN(base, DP_FER, cnt1); - DP_IN(base, DP_CER, cnt2); - DP_IN(base, DP_MISSED, cnt3); - DP_OUT(base, DP_ISR, DP_ISR_CNT); + io->in(base, DP_FER); + io->in(base, DP_CER); + io->in(base, DP_MISSED); + io->out(base, DP_ISR, DP_ISR_CNT); } /* @@ -560,55 +593,57 @@ dp83902a_ClearCounters(void) * out in section 7.0 of the datasheet. */ static void -dp83902a_Overflow(void) +dp83902a_Overflow(struct ne2k_private_data *pdata) { struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *)&nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; u8 isr; /* Issue a stop command and wait 1.6ms for it to complete. */ - DP_OUT(base, DP_CR, DP_CR_STOP | DP_CR_NODMA); + io->out(base, DP_CR, DP_CR_STOP | DP_CR_NODMA); CYGACC_CALL_IF_DELAY_US(1600); /* Clear the remote byte counter registers. */ - DP_OUT(base, DP_RBCL, 0); - DP_OUT(base, DP_RBCH, 0); + io->out(base, DP_RBCL, 0); + io->out(base, DP_RBCH, 0); /* Enter loopback mode while we clear the buffer. */ - DP_OUT(base, DP_TCR, DP_TCR_LOCAL); - DP_OUT(base, DP_CR, DP_CR_START | DP_CR_NODMA); + io->out(base, DP_TCR, DP_TCR_LOCAL); + io->out(base, DP_CR, DP_CR_START | DP_CR_NODMA); /* * Read in as many packets as we can and acknowledge any and receive * interrupts. Since the buffer has overflowed, a receive event of * some kind will have occured. */ - dp83902a_RxEvent(); - DP_OUT(base, DP_ISR, DP_ISR_RxP|DP_ISR_RxE); + dp83902a_RxEvent(pdata); + io->out(base, DP_ISR, DP_ISR_RxP|DP_ISR_RxE); /* Clear the overflow condition and leave loopback mode. */ - DP_OUT(base, DP_ISR, DP_ISR_OFLW); - DP_OUT(base, DP_TCR, DP_TCR_NORMAL); + io->out(base, DP_ISR, DP_ISR_OFLW); + io->out(base, DP_TCR, DP_TCR_NORMAL); /* * If a transmit command was issued, but no transmit event has occured, * restart it here. */ - DP_IN(base, DP_ISR, isr); + isr = io->in(base, DP_ISR); if (dp->tx_started && !(isr & (DP_ISR_TxP|DP_ISR_TxE))) { - DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_TXPKT | DP_CR_START); + io->out(base, DP_CR, DP_CR_NODMA | DP_CR_TXPKT | DP_CR_START); } } static void -dp83902a_poll(void) +dp83902a_poll(struct ne2k_private_data *pdata) { struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; u8 isr; - DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE0 | DP_CR_START); - DP_IN(base, DP_ISR, isr); + io->out(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE0 | DP_CR_START); + isr = io->in(base, DP_ISR); while (0 != isr) { /* * The CNT interrupt triggers when the MSB of one of the error @@ -616,7 +651,7 @@ dp83902a_poll(void) * we should read their values to reset them. */ if (isr & DP_ISR_CNT) { - dp83902a_ClearCounters(); + dp83902a_ClearCounters(pdata); } /* * Check for overflow. It's a special case, since there's a @@ -624,27 +659,27 @@ dp83902a_poll(void) * a running state.a */ if (isr & DP_ISR_OFLW) { - dp83902a_Overflow(); + dp83902a_Overflow(pdata); } else { /* * Other kinds of interrupts can be acknowledged simply by * clearing the relevant bits of the ISR. Do that now, then * handle the interrupts we care about. */ - DP_OUT(base, DP_ISR, isr); /* Clear set bits */ + io->out(base, DP_ISR, isr); /* Clear set bits */ if (!dp->running) break; /* Is this necessary? */ /* * Check for tx_started on TX event since these may happen * spuriously it seems. */ if (isr & (DP_ISR_TxP|DP_ISR_TxE) && dp->tx_started) { - dp83902a_TxEvent(); + dp83902a_TxEvent(pdata); } if (isr & (DP_ISR_RxP|DP_ISR_RxE)) { - dp83902a_RxEvent(); + dp83902a_RxEvent(pdata); } } - DP_IN(base, DP_ISR, isr); + isr = io->in(base, DP_ISR); } } @@ -655,13 +690,13 @@ static u8 *pbuf = NULL; static int pkey = -1; static int initialized = 0; -void uboot_push_packet_len(int len) { +void uboot_push_packet_len(struct ne2k_private_data *pdata, int len) { PRINTK("pushed len = %d\n", len); if (len >= 2000) { printf("NE2000: packet too big\n"); return; } - dp83902a_recv(&pbuf[0], len); + dp83902a_recv(pdata, &pbuf[0], len); /*Just pass it to the upper layer*/ NetReceive(&pbuf[0], len); @@ -717,7 +752,7 @@ static int ne2k_setup_driver(struct eth_device *dev) if (!eth_getenv_enetaddr("ethaddr", dev->enetaddr)) { /* If the MAC address is not in the environment, get it: */ if (!get_prom(dev->enetaddr, nic.base)) /* get MAC from prom */ - dp83902a_init(dev->enetaddr); /* fallback: seeprom */ + dp83902a_init(dev); /* fallback: seeprom */ /* And write it into the environment otherwise eth_write_hwaddr * returns -1 due to eth_getenv_enetaddr_by_index() failing, * and this causes "Warning: failed to set MAC address", and @@ -729,7 +764,7 @@ static int ne2k_setup_driver(struct eth_device *dev) static int ne2k_init(struct eth_device *dev, bd_t *bd) { - dp83902a_start(dev->enetaddr); + dp83902a_start(dev); initialized = 1; return 0; } @@ -738,28 +773,30 @@ static void ne2k_halt(struct eth_device *dev) { debug("### ne2k_halt\n"); if(initialized) - dp83902a_stop(); + dp83902a_stop(dev); initialized = 0; } static int ne2k_recv(struct eth_device *dev) { - dp83902a_poll(); + struct ne2k_private_data *pdata = dev->priv; + dp83902a_poll(pdata); return 1; } static int ne2k_send(struct eth_device *dev, volatile void *packet, int length) { int tmo; + struct ne2k_private_data *pdata = dev->priv; debug("### ne2k_send\n"); pkey = -1; - dp83902a_send((u8 *) packet, length, 666); + dp83902a_send(pdata, (u8 *) packet, length, 666); tmo = get_timer (0) + TOUT * CONFIG_SYS_HZ; while(1) { - dp83902a_poll(); + dp83902a_poll(pdata); if (pkey != -1) { PRINTK("Packet sucesfully sent\n"); return 0; @@ -775,25 +812,48 @@ static int ne2k_send(struct eth_device *dev, volatile void *packet, int length) /** * Setup the driver for use and register it with the eth layer - * @return 0 on success, -1 on error (causing caller to print error msg) + * @return 0 on success, < 0 on error (causing caller to print error msg) */ -int ne2k_register(void) +int ne2k_register_io(uint32_t (*in)(uint8_t *addr, uint32_t offset), + void (*out)(uint8_t *addr, uint32_t offset, uint32_t value)) { struct eth_device *dev; + struct ne2k_private_data *pdata; dev = calloc(sizeof(*dev), 1); if (dev == NULL) - return -1; + return -ENOMEM; + + pdata = calloc(sizeof(struct ne2k_private_data), 1); + if (pdata == NULL) { + free(dev); + return -ENOMEM; + } if (ne2k_setup_driver(dev)) - return -1; + return -EINVAL; + + if (in == NULL) + in = ne2k_default_in; + + if (out == NULL) + out = ne2k_default_out; + + pdata->io.in = in; + pdata->io.out = out; dev->init = ne2k_init; dev->halt = ne2k_halt; dev->send = ne2k_send; dev->recv = ne2k_recv; + dev->priv = pdata; sprintf(dev->name, "NE2000"); return eth_register(dev); } + +int ne2k_register(void) +{ + return ne2k_register_io(NULL, NULL); +} diff --git a/include/netdev.h b/include/netdev.h index 150fa8e..7ea4642 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -81,6 +81,8 @@ int mpc82xx_scc_enet_initialize(bd_t *bis); int mvgbe_initialize(bd_t *bis); int natsemi_initialize(bd_t *bis); int ne2k_register(void); +int ne2k_register_io(uint32_t (*in)(uint8_t *addr, uint32_t offset), + void (*out)(uint8_t *addr, uint32_t offset, uint32_t value)); int npe_initialize(bd_t *bis); int ns8382x_initialize(bd_t *bis); int pcnet_initialize(bd_t *bis); -- 1.7.7.1

3 11

[U-Boot] [RFC][PATCH] net: nfs: extend NFS_TIMEOUT
by Tetsuyuki Kobayashi 12 Jul '12

12 Jul '12

I tried nfs command on KZM-A9-GT board and it fails every time with "ERROR: Cannot umount". Current NFS_TIMEOUT value is 2000UL. It seems too short. I changed this to 10000UL then it succeeds. Signed-off-by: Tetsuyuki Kobayashi <koba(a)kmckk.co.jp> --- net/nfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/nfs.c b/net/nfs.c index 5b99763..390c6ee 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -31,7 +31,7 @@ #define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */ #define NFS_RETRY_COUNT 30 -#define NFS_TIMEOUT 2000UL +#define NFS_TIMEOUT 10000UL static int fs_mounted; static unsigned long rpc_id; -- 1.7.9.5

5 19

[U-Boot] [PATCH V2 1/1] net: phy: micrel: make ksz9021 phy accessible
by Troy Kisky 11 Jul '12

11 Jul '12

Micrel accidentally used the same part number for the KS8721 and KSZ9021. So, both cannot be in the same build of u-boot. Add a config option to handle this. Signed-off-by: Troy Kisky <troy.kisky(a)boundarydevices.com> Acked-by: Vladimir Zapolskiy <vz(a)mleia.com> --- v2: add ack --- drivers/net/phy/micrel.c | 15 +++++++++++++-- include/configs/mx6qsabrelite.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index e3043df..30f3264 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -35,6 +35,12 @@ static struct phy_driver KSZ804_driver = { .shutdown = &genphy_shutdown, }; +#ifndef CONFIG_PHY_MICREL_KSZ9021 +/* + * I can't believe Micrel used the exact same part number + * for the KSZ9021 + * Shame Micrel, Shame!!!!! + */ static struct phy_driver KS8721_driver = { .name = "Micrel KS8721BL", .uid = 0x221610, @@ -44,7 +50,9 @@ static struct phy_driver KS8721_driver = { .startup = &genphy_startup, .shutdown = &genphy_shutdown, }; +#endif +#ifdef CONFIG_PHY_MICREL_KSZ9021 /* ksz9021 PHY Registers */ #define MII_KSZ9021_EXTENDED_CTRL 0x0b #define MII_KSZ9021_EXTENDED_DATAW 0x0c @@ -127,12 +135,15 @@ static struct phy_driver ksz9021_driver = { .startup = &ksz9021_startup, .shutdown = &genphy_shutdown, }; +#endif int phy_micrel_init(void) { phy_register(&KSZ804_driver); - phy_register(&KS8721_driver); +#ifdef CONFIG_PHY_MICREL_KSZ9021 phy_register(&ksz9021_driver); - +#else + phy_register(&KS8721_driver); +#endif return 0; } diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h index feabc05..8623320 100644 --- a/include/configs/mx6qsabrelite.h +++ b/include/configs/mx6qsabrelite.h @@ -97,6 +97,7 @@ #define CONFIG_FEC_MXC_PHYADDR 6 #define CONFIG_PHYLIB #define CONFIG_PHY_MICREL +#define CONFIG_PHY_MICREL_KSZ9021 /* USB Configs */ #define CONFIG_CMD_USB -- 1.7.9.5

4 7

[U-Boot] [PATCH 1/3] common/cmd_rsmode.c: add imx reset mode command
by Troy Kisky 11 Jul '12

11 Jul '12

This is useful for forcing the ROM's usb downloader to activate upon a watchdog reset. Or, you can boot from either SD Card. Currently, support added for MX53 and MX6Q Signed-off-by: Troy Kisky <troy.kisky(a)boundarydevices.com> Note: MX53 support untested. --- arch/arm/include/asm/arch-mx5/imx-regs.h | 18 +++++ arch/arm/include/asm/arch-mx6/imx-regs.h | 21 +++++ common/Makefile | 1 + common/cmd_rsmode.c | 118 ++++++++++++++++++++++++++++++ 4 files changed, 158 insertions(+), 0 deletions(-) create mode 100644 common/cmd_rsmode.c diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h index cef4190..4f27c00 100644 --- a/arch/arm/include/asm/arch-mx5/imx-regs.h +++ b/arch/arm/include/asm/arch-mx5/imx-regs.h @@ -456,6 +456,24 @@ struct src { u32 simr; }; +struct srtc_regs { + u32 lpscmr; /* 0x00 */ + u32 lpsclr; /* 0x04 */ + u32 lpsar; /* 0x08 */ + u32 lpsmcr; /* 0x0c */ + u32 lpcr; /* 0x10 */ + u32 lpsr; /* 0x14 */ + u32 lppdr; /* 0x18 */ + u32 lpgr; /* 0x1c */ + u32 hpcmr; /* 0x20 */ + u32 hpclr; /* 0x24 */ + u32 hpamr; /* 0x28 */ + u32 hpalr; /* 0x2c */ + u32 hpcr; /* 0x30 */ + u32 hpisr; /* 0x34 */ + u32 hpienr; /* 0x38 */ +}; + /* CSPI registers */ struct cspi_regs { u32 rxdata; diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index e165810..5acc9ca 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -445,5 +445,26 @@ struct iomuxc_base_regs { u32 daisy[104]; /* 0x7b0..94c */ }; +struct src_regs { + u32 scr; /* 0x00 */ + u32 sbmr1; /* 0x04 */ + u32 srsr; /* 0x08 */ + u32 reserved1; /* 0x0c */ + u32 reserved2; /* 0x10 */ + u32 sisr; /* 0x14 */ + u32 simr; /* 0x18 */ + u32 sbmr2; /* 0x1c */ + u32 gpr1; /* 0x20 */ + u32 gpr2; /* 0x24 */ + u32 gpr3; /* 0x28 */ + u32 gpr4; /* 0x2c */ + u32 gpr5; /* 0x30 */ + u32 gpr6; /* 0x34 */ + u32 gpr7; /* 0x38 */ + u32 gpr8; /* 0x3c */ + u32 gpr9; /* 0x40 */ + u32 gpr10; /* 0x44 */ +}; + #endif /* __ASSEMBLER__*/ #endif /* __ASM_ARCH_MX6_IMX_REGS_H__ */ diff --git a/common/Makefile b/common/Makefile index d9f10f3..8e17cec 100644 --- a/common/Makefile +++ b/common/Makefile @@ -139,6 +139,7 @@ COBJS-$(CONFIG_CMD_PORTIO) += cmd_portio.o COBJS-$(CONFIG_CMD_PXE) += cmd_pxe.o COBJS-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o COBJS-$(CONFIG_CMD_REISER) += cmd_reiser.o +COBJS-$(CONFIG_CMD_RSMODE) += cmd_rsmode.o COBJS-$(CONFIG_CMD_SATA) += cmd_sata.o COBJS-$(CONFIG_CMD_SF) += cmd_sf.o COBJS-$(CONFIG_CMD_SCSI) += cmd_scsi.o diff --git a/common/cmd_rsmode.c b/common/cmd_rsmode.c new file mode 100644 index 0000000..40ad6bc --- /dev/null +++ b/common/cmd_rsmode.c @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2012 Boundary Devices Inc. + * + * 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 <asm/errno.h> +#include <asm/io.h> + +#define mkval(cfg1, cfg2, cfg3, cfg4) \ + ((cfg4) << 24) | ((cfg3) << 16) | ((cfg2) << 8) | (cfg1) + +struct reset_mode { + const char *name; + unsigned cfg_val; +}; + +#ifdef CONFIG_MX53 +/* + * cfg_val will be used for + * Boot_cfg3[7:0]:Boot_cfg2[7:0]:Boot_cfg1[7:0] + * + * If bit 28 of LPGR is set upon watchdog reset, + * bits[25:0] of LPGR will move to SBMR. + */ +#define SBMR_COPY_ADDR &((struct srtc_regs *)SRTC_BASE_ADDR)->lpgr +const struct reset_mode modes[] = { + {"normal", mkval(0x00, 0x00, 0x00, 0x00)}, + {"usb", mkval(0x00, 0x00, 0x00, 0x13)}, /* or serial download */ + {"sata", mkval(0x28, 0x00, 0x00, 0x12)}, + {"escpi1:0", mkval(0x38, 0x20, 0x00, 0x12)}, + {"escpi1:1", mkval(0x38, 0x20, 0x04, 0x12)}, + {"escpi1:2", mkval(0x38, 0x20, 0x08, 0x12)}, + {"escpi1:3", mkval(0x38, 0x20, 0x0c, 0x12)}, + {"esdhc1", mkval(0x40, 0x20, 0x00, 0x12)}, /* 4 bit bus width */ + {"esdhc2", mkval(0x40, 0x20, 0x08, 0x12)}, + {"esdhc3", mkval(0x40, 0x20, 0x10, 0x12)}, + {"esdhc4", mkval(0x40, 0x20, 0x18, 0x12)}, +}; +#endif + +#ifdef CONFIG_MX6Q +/* + * cfg_val will be used for + * Boot_cfg4[7:0]:Boot_cfg3[7:0]:Boot_cfg2[7:0]:Boot_cfg1[7:0] + */ +#define SBMR_COPY_ADDR &((struct src_regs *)SRC_BASE_ADDR)->gpr9 +/* + * After reset, if GPR10[28] is 1, ROM will copy GPR9[25:0] + * to SBMR1, which will determine the boot device. + */ +#define SMBR_COPY_ENABLE_ADDR &((struct src_regs *)SRC_BASE_ADDR)->gpr10 +const struct reset_mode modes[] = { + {"normal", mkval(0x00, 0x00, 0x00, 0x00)}, + /* reserved value should start rom usb */ + {"usb", mkval(0x01, 0x00, 0x00, 0x00)}, + {"sata", mkval(0x20, 0x00, 0x00, 0x00)}, + {"escpi1:0", mkval(0x30, 0x00, 0x00, 0x08)}, + {"escpi1:1", mkval(0x30, 0x00, 0x00, 0x18)}, + {"escpi1:2", mkval(0x30, 0x00, 0x00, 0x28)}, + {"escpi1:3", mkval(0x30, 0x00, 0x00, 0x38)}, + {"esdhc1", mkval(0x40, 0x20, 0x00, 0x00)}, /* 4 bit bus width */ + {"esdhc2", mkval(0x40, 0x28, 0x00, 0x00)}, + {"esdhc3", mkval(0x40, 0x30, 0x00, 0x00)}, + {"esdhc4", mkval(0x40, 0x38, 0x00, 0x00)}, +}; +#endif + +int do_rsmode(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + int i; + if (argc < 2) { +options: + printf("Options:\n"); + for (i = 0; i < ARRAY_SIZE(modes); i++) + printf("%s\n", modes[i].name); + return 0; + } + for (i = 0; i < ARRAY_SIZE(modes); i++) { + if (!strcmp(modes[i].name, argv[1])) + break; + } + if (i >= ARRAY_SIZE(modes)) + goto options; + writel(modes[i].cfg_val, SBMR_COPY_ADDR); +#ifdef SMBR_COPY_ENABLE_ADDR + { + unsigned reg = readl(SMBR_COPY_ENABLE_ADDR); + if (i) + reg |= 1 << 28; + else + reg &= ~(1 << 28); + writel(reg, SMBR_COPY_ENABLE_ADDR); + } +#endif + return 0; +} + +U_BOOT_CMD( + rsmode, 2, 0, do_rsmode, + "change reset mode to normal/usb/sata/ecspi1:1/esdhc1", + ""); -- 1.7.5.4

5 16

[U-Boot] [PATCH] pxe: get ethaddr from the current device instead of env
by Rob Herring 11 Jul '12

11 Jul '12

From: Rob Herring <rob.herring(a)calxeda.com> The env variable "ethaddr" may not be set, so get the address from the eth_device struct instead. This also enables pxe for secondary ethernet devices. Signed-off-by: Rob Herring <rob.herring(a)calxeda.com> --- common/cmd_pxe.c | 31 ++++++++++++------------------- 1 files changed, 12 insertions(+), 19 deletions(-) diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 3efd700..f14ef89 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -56,38 +56,31 @@ static char *from_env(char *envvar) */ static int format_mac_pxe(char *outbuf, size_t outbuf_len) { - size_t ethaddr_len; - char *p, *ethaddr; - - ethaddr = from_env("ethaddr"); - - if (!ethaddr) - return -ENOENT; - - ethaddr_len = strlen(ethaddr); + char *p; + struct eth_device *dev; /* * ethaddr_len + 4 gives room for "01-", ethaddr, and a NUL byte at * the end. */ - if (outbuf_len < ethaddr_len + 4) { - printf("outbuf is too small (%d < %d)\n", - outbuf_len, ethaddr_len + 4); - + if (outbuf_len < 21) { + printf("outbuf is too small (%d < 21)\n", outbuf_len); return -EINVAL; } - strcpy(outbuf, "01-"); + eth_set_current(); + dev = eth_get_dev(); + if (!dev) + return -ENODEV; - for (p = outbuf + 3; *ethaddr; ethaddr++, p++) { - if (*ethaddr == ':') + sprintf(outbuf, "01-%pM", dev->enetaddr); + for (p = outbuf + 3; *p; p++) { + if (*p == ':') *p = '-'; else - *p = tolower(*ethaddr); + *p = tolower(*p); } - *p = '\0'; - return 1; } -- 1.7.5.4

4 13