July 2019 - U-Boot

[U-Boot] [PATCH v2 00/11] dm: Convert TPC70 to use DM and DTS in SPL and u-boot proper
by Lukasz Majewski 13 Aug '19

13 Aug '19

This patch series converts imx6q based tpc70 board to use driver model and device tree description in SPL and u-boot proper. All the non-DM parts of the code has been removed. This patch series also uses the Common Clock Framework [CCF] as a base for clock management on imx6q board. Travis-CI: https://travis-ci.org/lmajewski/u-boot-dfu/builds/565198753 Those patches are applied on top of -master: SHA1: 75551c8bfc9545e31ec2ce238cac3857904007b8 Lukasz Majewski (11): imx: tpc70: config: Add script commands to update u-boot and OE's wic imx: tpc70: config: Update TPC70 config to support eMMC's boot0 SPL update imx: tpc70: Add board_boot_order() to distinguish between eMMC and SD boot imx: tpc70: DTS: Explicitly add imx6q-kp.dtb to Makefile for DTB compilation imx: tpc70: cosmetic: Replace magic numbers when setting ENET clock imx: tpc70: led: Enable LED default state imx: tpc70: dts: Add TPC70 board (imx6q based) device tree description imx: dts: Add u-boot specific set of device tree properties for tpc70 imx: tpc70: Convert TPC70 (imx6q) board to use DM/DTS in SPL and u-boot imx: spl: tpc70: Do not remove clock related properties from DTS imx: config: Update KP's TPC70 config to support SWUpdate arch/arm/dts/Makefile | 1 + arch/arm/dts/imx6q-kp-u-boot.dtsi | 59 ++++++++ arch/arm/dts/imx6q-kp.dts | 219 ++++++++++++++++++++++++++++++ arch/arm/mach-imx/mx6/Kconfig | 10 ++ board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c | 172 ++--------------------- board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c | 137 ++----------------- configs/kp_imx6q_tpc_defconfig | 34 ++++- include/configs/kp_imx6q_tpc.h | 54 ++++---- 8 files changed, 377 insertions(+), 309 deletions(-) create mode 100644 arch/arm/dts/imx6q-kp-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-kp.dts -- 2.11.0

3 24

[U-Boot] [PATCH] arm: dts: imx: fsl-imx8qm.dtsi: add gpio aliases to fix gpio command
by Peng Fan 13 Aug '19

13 Aug '19

The gpio command currently uses equal bank names "GPIO0_" for all existing gpio banks, i. e.: U-Boot# gpio status -a Bank GPIO0_: GPIO0_0: input: 0 [ ] GPIO0_1: input: 0 [ ] ... Bank GPIO0_: GPIO0_0: input: 0 [ ] GPIO0_1: input: 0 [ ] ... So the command is broken, it is not possible to address a desired bank. Add gpio aliases to fix this. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- arch/arm/dts/fsl-imx8qm.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/dts/fsl-imx8qm.dtsi b/arch/arm/dts/fsl-imx8qm.dtsi index af060db3a1..6808f68f9d 100644 --- a/arch/arm/dts/fsl-imx8qm.dtsi +++ b/arch/arm/dts/fsl-imx8qm.dtsi @@ -21,6 +21,13 @@ aliases { ethernet0 = &fec1; ethernet1 = &fec2; + gpio0 = &gpio1; + gpio1 = &gpio2; + gpio2 = &gpio3; + gpio3 = &gpio4; + gpio4 = &gpio5; + gpio5 = &gpio6; + gpio6 = &gpio7; serial0 = &lpuart0; serial1 = &lpuart1; serial2 = &lpuart2; -- 2.16.4

2 2

[U-Boot] [PATCH] imx: mx6slevk: enable DM_SPI and DM_SPI_FLASH
by Peng Fan 13 Aug '19

13 Aug '19

With DM_SPI and DM_SPI_FLASH enabled, we could get: spi 0 [ ] mxc_spi | | | `-- ecspi@02008000 spi_flash 0 [ ] spi_flash_std | | | `-- m25p80@0 Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- board/freescale/mx6slevk/mx6slevk.c | 28 ---------------------------- configs/mx6slevk_defconfig | 2 ++ configs/mx6slevk_spinor_defconfig | 2 ++ configs/mx6slevk_spl_defconfig | 2 ++ 4 files changed, 6 insertions(+), 28 deletions(-) diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index 4c48679037..33ae91c307 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -15,7 +15,6 @@ #include <asm/gpio.h> #include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/mxc_i2c.h> -#include <asm/mach-imx/spi.h> #include <asm/io.h> #include <linux/sizes.h> #include <common.h> @@ -41,9 +40,6 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ PAD_CTL_DSE_40ohm | PAD_CTL_HYS) -#define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) - #define OTGID_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_LOW |\ PAD_CTL_DSE_80ohm | PAD_CTL_HYS | \ @@ -120,25 +116,6 @@ static iomux_v3_cfg_t const fec_pads[] = { MX6_PAD_FEC_TX_CLK__GPIO_4_21 | MUX_PAD_CTRL(NO_PAD_CTRL), }; -#ifdef CONFIG_MXC_SPI -static iomux_v3_cfg_t ecspi1_pads[] = { - MX6_PAD_ECSPI1_MISO__ECSPI_MISO | MUX_PAD_CTRL(SPI_PAD_CTRL), - MX6_PAD_ECSPI1_MOSI__ECSPI_MOSI | MUX_PAD_CTRL(SPI_PAD_CTRL), - MX6_PAD_ECSPI1_SCLK__ECSPI_SCLK | MUX_PAD_CTRL(SPI_PAD_CTRL), - MX6_PAD_ECSPI1_SS0__GPIO4_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL), -}; - -int board_spi_cs_gpio(unsigned bus, unsigned cs) -{ - return (bus == 0 && cs == 0) ? (IMX_GPIO_NR(4, 11)) : -1; -} - -static void setup_spi(void) -{ - imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads)); -} -#endif - static void setup_iomux_uart(void) { imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); @@ -232,11 +209,6 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; -#ifdef CONFIG_MXC_SPI - gpio_request(IMX_GPIO_NR(4, 11), "spi_cs"); - setup_spi(); -#endif - #ifdef CONFIG_FEC_MXC setup_fec(); #endif diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig index 643cad4a65..b1c8161da6 100644 --- a/configs/mx6slevk_defconfig +++ b/configs/mx6slevk_defconfig @@ -35,6 +35,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC_IMX=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000 @@ -50,6 +51,7 @@ CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_USB=y diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig index 3dada9961a..282b10cd8f 100644 --- a/configs/mx6slevk_spinor_defconfig +++ b/configs/mx6slevk_spinor_defconfig @@ -35,6 +35,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC_IMX=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000 @@ -50,6 +51,7 @@ CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_USB=y diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig index 63a7a74b0a..5958065c62 100644 --- a/configs/mx6slevk_spl_defconfig +++ b/configs/mx6slevk_spl_defconfig @@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC_IMX=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000 @@ -59,6 +60,7 @@ CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_USB=y -- 2.16.4

1 1

[U-Boot] [PATCH] travis.yml: change Ubuntu version to xenial
by Ramon Fried 12 Aug '19

12 Aug '19

trusty is getting old, move to xenial (16.04) to get updated gcc and other tools. Signed-off-by: Ramon Fried <rfried.dev(a)gmail.com> --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c21bbbbca4..1640fbb6dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ # build U-Boot on Travis CI - https://travis-ci.org/ sudo: required -dist: trusty +dist: xenial language: c -- 2.22.0

3 11

[U-Boot] [PATCH u-boot-marvell 1/1] arm: mvebu: turris_omnia: update defconfig
by Marek Behún 12 Aug '19

12 Aug '19

Add Macronis SPI flash support - some Omnia routers are shipped with this SPI flash chip. Also add the memtest command to defconfig. Signed-off-by: Marek Behún <marek.behun(a)nic.cz> --- configs/turris_omnia_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig index e04156311f..fb83a0b9ba 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig @@ -44,6 +44,8 @@ CONFIG_CMD_TIME=y CONFIG_CMD_AES=y CONFIG_CMD_HASH=y CONFIG_CMD_BTRFS=y +CONFIG_CMD_MEMTEST=y +CONFIG_SYS_ALT_MEMTEST=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DEFAULT_DEVICE_TREE="armada-385-turris-omnia" CONFIG_ENV_IS_IN_SPI_FLASH=y @@ -59,6 +61,7 @@ CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_MV=y CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y CONFIG_PHY_GIGE=y -- 2.21.0

2 2

[U-Boot] [PATCH] ARM: configs: Enable DM_ETH for SBx81LIFKW and SBx81LIFXCAT
by Chris Packham 12 Aug '19

12 Aug '19

The mvgbe driver supports DM_ETH so switch these boards to using it. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- configs/SBx81LIFKW_defconfig | 3 +++ configs/SBx81LIFXCAT_defconfig | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig index 8cb397c7570b..f9ca3428a2a0 100644 --- a/configs/SBx81LIFKW_defconfig +++ b/configs/SBx81LIFKW_defconfig @@ -10,6 +10,7 @@ CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_U_BOOT_ONLY=y CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_DM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_I2C=y CONFIG_CMD_SF=y @@ -40,6 +41,8 @@ CONFIG_MV88E61XX_SWITCH=y CONFIG_MV88E61XX_CPU_PORT=10 CONFIG_MV88E61XX_PHY_PORTS=0x003 CONFIG_MV88E61XX_FIXED_PORTS=0x300 +CONFIG_PHY_FIXED=y +CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DM_RTC=y CONFIG_RTC_MV=y diff --git a/configs/SBx81LIFXCAT_defconfig b/configs/SBx81LIFXCAT_defconfig index 1f7ff812f478..a8dc9f174986 100644 --- a/configs/SBx81LIFXCAT_defconfig +++ b/configs/SBx81LIFXCAT_defconfig @@ -10,6 +10,7 @@ CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_U_BOOT_ONLY=y CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_DM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y @@ -44,6 +45,8 @@ CONFIG_MV88E61XX_SWITCH=y CONFIG_MV88E61XX_CPU_PORT=10 CONFIG_MV88E61XX_PHY_PORTS=0x003 CONFIG_MV88E61XX_FIXED_PORTS=0x300 +CONFIG_PHY_FIXED=y +CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_SPI=y CONFIG_DM_SPI=y -- 2.22.0

2 2

[U-Boot] [PATCH 0/9] km: Kconfig and driver model implementations
by Pascal Linder 12 Aug '19

12 Aug '19

This series of patches contains the driver model implementation for the UART and Ethernet interface on KM Kirkwood boards. Moreover, the conversion from header files to Kconfig has been advanced. Finally, three now unmaintained boards are removed in order to clean up the source code. The patches cannot directly be put on mainline, as they depend on a previously sent series that is, however, not yet mainlined. Meant is the SPI driver model implementation that is found on the mailing list over following link: https://lists.denx.de/pipermail/u-boot/2019-June/373115.html. Most importantly it is the first patch of the series setting up a new Kconfig file organization for KM boards, which is required. Holger Brunck (2): powerpc/km: remove unmaintained target KMVECT1 powerpc/km: remove unmaintained board KMLION1 Pascal Linder (7): km: add Kconfig menus for KM boards km: remove obsolete definitions in KM header files km: clean up header files for KM Kirkwood boards km: fixed typo in KM Kirkwood header file km/uart: port UART interface of KM Kirkwood boards to driver model km/rgmii: port Ethernet interface of KM Kirkwood boards to driver model km/arm: remove unmaintained target PORTL2 arch/arm/dts/kirkwood-km_common.dtsi | 1 + arch/powerpc/cpu/mpc83xx/Kconfig | 4 - board/keymile/Kconfig | 101 +++++++ board/keymile/common/common.h | 4 - board/keymile/common/ivm.c | 5 - board/keymile/km83xx/Kconfig | 19 -- board/keymile/km83xx/MAINTAINERS | 1 - board/keymile/km83xx/km83xx.c | 81 ------ board/keymile/km_arm/Kconfig | 31 ++ board/keymile/km_arm/MAINTAINERS | 1 - board/keymile/kmp204x/MAINTAINERS | 1 - configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge5un_defconfig | 3 + configs/kmlion1_defconfig | 57 ---- configs/kmnusa_defconfig | 4 + configs/kmsugp1_defconfig | 4 + configs/kmsuv31_defconfig | 2 + configs/kmvect1_defconfig | 180 ------------ configs/mgcoge3un_defconfig | 2 + configs/portl2_defconfig | 46 --- include/configs/km/keymile-common.h | 8 - include/configs/km/km-mpc83xx.h | 4 - include/configs/km/km-powerpc.h | 13 - include/configs/km/km_arm.h | 54 +--- include/configs/km/kmp204x-common.h | 409 -------------------------- include/configs/km_kirkwood.h | 28 +- include/configs/kmp204x.h | 410 +++++++++++++++++++++++++-- include/configs/kmvect1.h | 61 ---- scripts/config_whitelist.txt | 22 -- 29 files changed, 541 insertions(+), 1016 deletions(-) delete mode 100644 configs/kmlion1_defconfig delete mode 100644 configs/kmvect1_defconfig delete mode 100644 configs/portl2_defconfig delete mode 100644 include/configs/km/kmp204x-common.h delete mode 100644 include/configs/kmvect1.h -- 2.21.0

2 5

[U-Boot] [BISECTED] [BUG]: MMC initialization hang at Zynq Z-turn board
by Matwey V. Kornilov 09 Aug '19

09 Aug '19

Hello, I am running Zynq Z-turn board and I face the following issue with MMC initialization in SPL. With u-boot master, I see the message similar to the following: U-Boot SPL 2019.07-00352-gb5f3eb3393 (Jul 31 2019 - 20:03:42 +0300) mmc boot Trying to boot from MMC1 Then, the u-boot waits forever. I've tried to add debug prints and found that execution is stalled somewhere inside mmc_init(). Using bisect I've found that the following broken commit is the following: commit 3d296365e4e8823c7c0d4b568fa7accfae4bf895 (refs/bisect/bad) Author: Faiz Abbas <faiz_abbas(a)ti.com> Date: Tue Jun 11 00:43:34 2019 +0530 mmc: sdhci: Add support for sdhci-caps-mask Add Support for masking some bits in the capabilities register of a host controller. Also remove the redundant readl() into caps1. Signed-off-by: Faiz Abbas <faiz_abbas(a)ti.com> Reviewed-by: Tom Rini <trini(a)konsulko.com> Until that commit the behavior was the following: U-Boot SPL 2019.07-00351-g889a4dfc55 (Jul 31 2019 - 20:01:41 +0300) mmc boot Trying to boot from MMC1 spl_load_image_fat_os: error reading image system.dtb, err - -2 spl_load_image_fat: error reading image u-boot.img, err - -2 SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ### There were no u-boot.img at the SD card while testing, so this error message is expected here. 5456935a1da3 ("ARM: zynq: Add configuration for Z-turn board") was applied at the top of every testing commit to allow the board initialization in SPL. What could be wrong with that commit and how could I fix the board? -- With best regards, Matwey V. Kornilov

4 11

[U-Boot] [PATCH 1/3] spl: imx6: Let spl_boot_device return USDHC1 or USDHC2
by Adam Ford 09 Aug '19

09 Aug '19

Currently, when the spl_boot_device checks the boot device, it will only return MMC1 when it's either sd or eMMC regardless of whether or not it's MMC1 or MMC2. This is a problem when booting from MMC2 if MMC isn't being manually configured like in the DM_SPL case with SPL_OF_CONTROL. This patch will check the register and return either MMC1 or MMC2. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 9f1e0f6a72..1f230aca33 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -24,6 +24,7 @@ u32 spl_boot_device(void) { unsigned int bmode = readl(&src_base->sbmr2); u32 reg = imx6_src_get_boot_mode(); + u32 mmc_index = ((reg >> 11) & 0x03); /* * Check for BMODE if serial downloader is enabled @@ -84,11 +85,12 @@ u32 spl_boot_device(void) /* SD/eSD: 8.5.3, Table 8-15 */ case IMX6_BMODE_SD: case IMX6_BMODE_ESD: - return BOOT_DEVICE_MMC1; - /* MMC/eMMC: 8.5.3 */ case IMX6_BMODE_MMC: case IMX6_BMODE_EMMC: - return BOOT_DEVICE_MMC1; + if (mmc_index == 1) + return BOOT_DEVICE_MMC2; + else + return BOOT_DEVICE_MMC1; /* NAND Flash: 8.5.2, Table 8-10 */ case IMX6_BMODE_NAND_MIN ... IMX6_BMODE_NAND_MAX: return BOOT_DEVICE_NAND; -- 2.17.1

5 11

[U-Boot] [PATCH] x86: qemu: Fix non-working ramboot and nfsboot environment variables
by Bin Meng 08 Aug '19

08 Aug '19

With qemu-x86 starting to use config_distro_bootcmd, the pre-defined ramboot and nfsboot commands do not work any more. This is caused by undefined environment variable 'ramdiskaddr' that was previously set in CONFIG_EXTRA_ENV_SETTINGS but later CONFIG_EXTRA_ENV_SETTINGS was redefined for distro boot. Update the x86 generic CONFIG_EXTRA_ENV_SETTINGS to consider distro boot, and remove the one in qemu-x86.h. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- include/configs/qemu-x86.h | 10 ---------- include/configs/x86-common.h | 21 ++++++++++++++------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 097ed41..c557420 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -27,16 +27,6 @@ #define CONFIG_PREBOOT "pci enum" -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_STD_DEVICES_SETTINGS \ - "scriptaddr=0x7000000\0" \ - "kernel_addr_r=0x1000000\0" \ - "ramdisk_addr_r=0x4000000\0" \ - "consoledev=ttyS0\0" \ - CONFIG_OTHBOOTARGS \ - BOOTENV - #define CONFIG_SYS_MONITOR_LEN (1 << 20) #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 7fcf76a..4227d93 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -106,30 +106,37 @@ #define CONFIG_OTHBOOTARGS "othbootargs=acpi=off\0" #endif +#ifndef CONFIG_DISTRO_DEFAULTS +#define BOOTENV +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_STD_DEVICES_SETTINGS \ "pciconfighost=1\0" \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ CONFIG_OTHBOOTARGS \ - "ramdiskaddr=0x4000000\0" \ - "ramdiskfile=initramfs.gz\0" + "scriptaddr=0x7000000\0" \ + "kernel_addr_r=0x1000000\0" \ + "ramdisk_addr_r=0x4000000\0" \ + "ramdiskfile=initramfs.gz\0" \ + BOOTENV #define CONFIG_RAMBOOTCOMMAND \ "setenv bootargs root=/dev/ram rw " \ "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \ "console=$consoledev,$baudrate $othbootargs;" \ - "tftpboot $loadaddr $bootfile;" \ - "tftpboot $ramdiskaddr $ramdiskfile;" \ - "zboot $loadaddr 0 $ramdiskaddr $filesize" + "tftpboot $kernel_addr_r $bootfile;" \ + "tftpboot $ramdisk_addr_r $ramdiskfile;" \ + "zboot $kernel_addr_r 0 $ramdisk_addr_r $filesize" #define CONFIG_NFSBOOTCOMMAND \ "setenv bootargs root=/dev/nfs rw " \ "nfsroot=$serverip:$rootpath " \ "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \ "console=$consoledev,$baudrate $othbootargs;" \ - "tftpboot $loadaddr $bootfile;" \ - "zboot $loadaddr" + "tftpboot $kernel_addr_r $bootfile;" \ + "zboot $kernel_addr_r" #endif /* __CONFIG_H */ -- 2.7.4

1 1