May 2014 - U-Boot

[U-Boot] [PATCH v3 0/12] Enable LCD display on snow
by Simon Glass 29 May '14

29 May '14

This series adds a driver for TPS65090 and plumbs it in to get the LCD working correctly on snow. The display driver is already present, but needs information about the display to be provided in the device tree. The backlight also needs to be enabled - it is controlled by a FET on the TPS65090. Note that the TPS65090 is controlled by the device tree so will only be present if the board's device tree file specifies it. At present this is only the case for snow, but other exynos5 boards will use it (e.g. pit). Note: the TPS65090 driver was sent to the list around the middle of last year but was never applied. Changes in v3: - Add new patch to correct EC interrupt GPIO - Rebase on samsung/master - Remove extra blank lines in two places - Use !! style instead ternary operator - Change the ptn3460 comment to indicate a TODO for device tree GPIOs - Rename MAX_TRIES to lower case - Rename onoff to on - Use generic GPIO API - Drop patch "exynos: dts: Disable cros_ec interrupts due to broken GPIOs" Changes in v2: - Add new patch to drop smdk5250.c file - Add new patch to rename CHARGER_EN/DISABLE - Removed non-device-tree operation - Use errno.h for error return codes everywhere - Plumb into pmic charging framework - Fix style nit - Use correct license header - Use new Linux device tree bindings - Add partial battery charging support - Update patch name to exynos5-dt instead of smdk5250 - Move code to exynos5-dt.c - Fix comment style - Add #ifdef around tps65090 code - Add a device tree node for the snow EDP bridge chip - Only set up the EDP bridge for snow - Add a device tree compatibility string for the EDP bridge - Check for EDP failure and print an error in that case - Return immediately in exynos_backlight_on() if needed - Rebase to samsung/master Aaron Durbin (3): exynos5: Enable tps65090 on exynos5-dt power: Explicitly select pmic device's bus exynos5: support tps65090 pmic Simon Glass (8): exynos: dts: Correct EC interrupt GPIO exynos: Drop old smdk5250.c file power: Rename CONFIG_PMIC_... to CONFIG_POWER_... power: Add PMIC_ prefix to CHARGER_EN/DISABLE exynos: Enable PSHOLD in SPL exynos: dts: Enable LCD for snow exynos: Enable the LCD backlight for snow initcall: Improve debugging support Tom Wai-Hong Tam (1): power: Add support for TPS65090 PMU chip. arch/arm/cpu/armv7/exynos/lowlevel_init.c | 2 + arch/arm/dts/exynos5250-snow.dts | 61 +++- board/samsung/smdk5250/Makefile | 4 - board/samsung/smdk5250/exynos5-dt.c | 238 +++++++++++++++- board/samsung/smdk5250/smdk5250.c | 363 ------------------------ doc/device-tree-bindings/power/tps65090.txt | 17 ++ doc/device-tree-bindings/regulator/tps65090.txt | 122 ++++++++ drivers/power/battery/bat_trats.c | 4 +- drivers/power/battery/bat_trats2.c | 2 +- drivers/power/mfd/pmic_max77693.c | 2 +- drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_max8997.c | 2 +- drivers/power/pmic/pmic_tps65090.c | 310 ++++++++++++++++++++ drivers/power/power_fsl.c | 6 +- drivers/power/power_i2c.c | 4 + include/configs/arndale.h | 4 +- include/configs/exynos5-dt.h | 1 + include/configs/exynos5250-dt.h | 2 +- include/configs/mx25pdk.h | 2 +- include/configs/mx35pdk.h | 2 +- include/configs/mx53evk.h | 2 +- include/configs/mx53loco.h | 2 +- include/configs/woodburn_common.h | 2 +- include/fdtdec.h | 2 + include/initcall.h | 2 +- include/power/max77693_pmic.h | 2 - include/power/max8997_pmic.h | 1 - include/power/pmic.h | 5 + include/power/tps65090_pmic.h | 73 +++++ lib/fdtdec.c | 2 + lib/initcall.c | 17 +- 31 files changed, 864 insertions(+), 395 deletions(-) delete mode 100644 board/samsung/smdk5250/smdk5250.c create mode 100644 doc/device-tree-bindings/power/tps65090.txt create mode 100644 doc/device-tree-bindings/regulator/tps65090.txt create mode 100644 drivers/power/pmic/pmic_tps65090.c create mode 100644 include/power/tps65090_pmic.h -- 1.9.1.423.g4596e3a

3 15

[U-Boot] [PATCH 1/2] arm: rmobile: lager: Remove NOR-Flash support from boards.cfg
by Nobuhiro Iwamatsu 29 May '14

29 May '14

Lager board has NOR-Flash support of koelsch board has been removed. But this remains in the boards.cfg. This removed config of NOR-Flash from boards.cfg. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- boards.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/boards.cfg b/boards.cfg index 8b1177c..245a6d3 100644 --- a/boards.cfg +++ b/boards.cfg @@ -375,7 +375,6 @@ Active arm armv7 rmobile kmc kzm9g Active arm armv7 rmobile renesas koelsch koelsch - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> Active arm armv7 rmobile renesas koelsch koelsch_nor koelsch:NORFLASH Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> Active arm armv7 rmobile renesas lager lager - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> -Active arm armv7 rmobile renesas lager lager_nor lager:NORFLASH Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> Active arm armv7 s5pc1xx samsung goni s5p_goni - Przemyslaw Marczak <p.marczak(a)samsung.com> Active arm armv7 s5pc1xx samsung smdkc100 smdkc100 - Minkyu Kang <mk7.kang(a)samsung.com> Active arm armv7 socfpga altera socfpga socfpga_cyclone5 - - -- 1.9.2

1 1

[U-Boot] [PATCH] serial_mxc: disable new features of autobaud detection
by Eric Nelson 28 May '14

28 May '14

Bit 7 of UCR3 is described in the i.MX3x/i.MX5x/i.MX6x reference manuals as follows: Autobaud Detection Not Improved-. Disables new features of autobaud detection (See Baud Rate Automatic Detection Protocol, for more details). 0 Autobaud detection new features selected 1 Keep old autobaud detection mechanism On at least i.MX6DQ, i.MX6DLS and i.MX53, the "new features" occasionally cause the receiver to get out of sync and continuously produce received characters of '\xff'. This patch disables the "new feature" on all boards, since there's no support for auto-baud in U-Boot on any of them. More details are available in this post on i.MX Community: https://community.freescale.com/message/403254 Signed-off-by: Eric Nelson <eric.nelson(a)boundarydevices.com> Tested-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- drivers/serial/serial_mxc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index 56bee55..313d560 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -77,7 +77,7 @@ #define UCR3_DSR (1<<10) /* Data set ready */ #define UCR3_DCD (1<<9) /* Data carrier detect */ #define UCR3_RI (1<<8) /* Ring indicator */ -#define UCR3_TIMEOUTEN (1<<7) /* Timeout interrupt enable */ +#define UCR3_ADNIMP (1<<7) /* Autobaud Detection Not Improved */ #define UCR3_RXDSEN (1<<6) /* Receive status interrupt enable */ #define UCR3_AIRINTEN (1<<5) /* Async IR wake interrupt enable */ #define UCR3_AWAKEN (1<<4) /* Async wake interrupt enable */ @@ -186,7 +186,7 @@ static int mxc_serial_init(void) while (!(__REG(UART_PHYS + UCR2) & UCR2_SRST)); - __REG(UART_PHYS + UCR3) = 0x0704; + __REG(UART_PHYS + UCR3) = 0x0704 | UCR3_ADNIMP; __REG(UART_PHYS + UCR4) = 0x8000; __REG(UART_PHYS + UESC) = 0x002b; __REG(UART_PHYS + UTIM) = 0x0; -- 1.9.1

2 2

[U-Boot] [PATCH v4] mx6sabred: Add PFUZE100 PMIC support
by Fabio Estevam 28 May '14

28 May '14

From: Fabio Estevam <fabio.estevam(a)freescale.com> mx6sabresd boards have a PFUZE100 PMIC connected to I2C2 bus. Add support for it Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v3: - Rebase against latest u-boot.imx and call 'power_pfuze100_init' Changes since v2: - Remove uneeded CONFIG_BOARD_LATE_INI inside mx6sabresd.h as this is already included in mx6sabre_common.h Changes since v1: - Init the PMIC inside board_late_init() Stefano, I tried your suggestion of calling the pmic init inside power_init_board(), but pmic dump command fails, so I am calling the pmic init from board_late_init() as done on other boards for now. board/freescale/mx6sabresd/mx6sabresd.c | 84 +++++++++++++++++++++++++++++++++ include/configs/mx6sabresd.h | 12 +++++ include/power/pfuze100_pmic.h | 4 ++ 3 files changed, 100 insertions(+) diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 3e314da..d7c4b4f 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -12,6 +12,7 @@ #include <asm/arch/mx6-pins.h> #include <asm/errno.h> #include <asm/gpio.h> +#include <asm/imx-common/mxc_i2c.h> #include <asm/imx-common/iomux-v3.h> #include <asm/imx-common/boot_mode.h> #include <asm/imx-common/video.h> @@ -23,6 +24,9 @@ #include <asm/arch/crm_regs.h> #include <asm/io.h> #include <asm/arch/sys_proto.h> +#include <i2c.h> +#include <power/pmic.h> +#include <power/pfuze100_pmic.h> DECLARE_GLOBAL_DATA_PTR; #define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ @@ -39,6 +43,14 @@ DECLARE_GLOBAL_DATA_PTR; #define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \ PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) +#define I2C_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ + PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ + PAD_CTL_ODE | PAD_CTL_SRE_FAST) + +#define I2C_PMIC 1 + +#define I2C_PAD MUX_PAD_CTRL(I2C_PAD_CTRL) + int dram_init(void) { gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); @@ -129,6 +141,19 @@ iomux_v3_cfg_t const ecspi1_pads[] = { MX6_PAD_KEY_ROW1__GPIO4_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL), }; +static struct i2c_pads_info i2c_pad_info1 = { + .scl = { + .i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | I2C_PAD, + .gpio_mode = MX6_PAD_KEY_COL3__GPIO4_IO12 | I2C_PAD, + .gp = IMX_GPIO_NR(4, 12) + }, + .sda = { + .i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | I2C_PAD, + .gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | I2C_PAD, + .gp = IMX_GPIO_NR(4, 13) + } +}; + static void setup_spi(void) { imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads)); @@ -426,6 +451,64 @@ int board_init(void) #ifdef CONFIG_MXC_SPI setup_spi(); #endif + setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); + + return 0; +} + +static int pfuze_init(void) +{ + struct pmic *p; + int ret; + unsigned int reg; + + ret = power_pfuze100_init(I2C_PMIC); + if (ret) + return ret; + + p = pmic_get("PFUZE100_PMIC"); + ret = pmic_probe(p); + if (ret) + return ret; + + pmic_reg_read(p, PFUZE100_DEVICEID, &reg); + printf("PMIC: PFUZE100 ID=0x%02x\n", reg); + + /* Increase VGEN3 from 2.5 to 2.8V */ + pmic_reg_read(p, PFUZE100_VGEN3VOL, &reg); + reg &= ~0xf; + reg |= 0xa; + pmic_reg_write(p, PFUZE100_VGEN3VOL, reg); + + /* Increase VGEN5 from 2.8 to 3V */ + pmic_reg_read(p, PFUZE100_VGEN5VOL, &reg); + reg &= ~0xf; + reg |= 0xc; + pmic_reg_write(p, PFUZE100_VGEN5VOL, reg); + + /* Set SW1AB stanby volage to 0.975V */ + pmic_reg_read(p, PFUZE100_SW1ABSTBY, &reg); + reg &= ~0x3f; + reg |= 0x1b; + pmic_reg_write(p, PFUZE100_SW1ABSTBY, reg); + + /* Set SW1AB/VDDARM step ramp up time from 16us to 4us/25mV */ + pmic_reg_read(p, PUZE_100_SW1ABCONF, &reg); + reg &= ~0xc0; + reg |= 0x40; + pmic_reg_write(p, PUZE_100_SW1ABCONF, reg); + + /* Set SW1C standby voltage to 0.975V */ + pmic_reg_read(p, PFUZE100_SW1CSTBY, &reg); + reg &= ~0x3f; + reg |= 0x1b; + pmic_reg_write(p, PFUZE100_SW1CSTBY, reg); + + /* Set SW1C/VDDSOC step ramp up time from 16us to 4us/25mV */ + pmic_reg_read(p, PFUZE100_SW1CCONF, &reg); + reg &= ~0xc0; + reg |= 0x40; + pmic_reg_write(p, PFUZE100_SW1CCONF, reg); return 0; } @@ -446,6 +529,7 @@ int board_late_init(void) #ifdef CONFIG_CMD_BMODE add_board_boot_modes(board_boot_modes); #endif + pfuze_init(); return 0; } diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 0fa6573..e666ebb 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -59,4 +59,16 @@ #define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(3, 19) #endif +/* I2C Configs */ +#define CONFIG_CMD_I2C +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_MXC +#define CONFIG_SYS_I2C_SPEED 100000 + +/* PMIC */ +#define CONFIG_POWER +#define CONFIG_POWER_I2C +#define CONFIG_POWER_PFUZE100 +#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 + #endif /* __MX6QSABRESD_CONFIG_H */ diff --git a/include/power/pfuze100_pmic.h b/include/power/pfuze100_pmic.h index 444aba6..0002f1e 100644 --- a/include/power/pfuze100_pmic.h +++ b/include/power/pfuze100_pmic.h @@ -15,7 +15,11 @@ enum { PFUZE100_FABID = 0x04, PFUZE100_SW1ABVOL = 0x20, + PFUZE100_SW1ABSTBY = 0x21, + PUZE_100_SW1ABCONF = 0x24, PFUZE100_SW1CVOL = 0x2e, + PFUZE100_SW1CSTBY = 0x2f, + PFUZE100_SW1CCONF = 0x32, PFUZE100_SW2VOL = 0x35, PFUZE100_SW3AVOL = 0x3c, PFUZE100_SW3BVOL = 0x43, -- 1.8.3.2

2 3

[U-Boot] [PATCH v2 1/3] mx28evk: Remove extra CONFIG_ENV_SIZE
by Fabio Estevam 28 May '14

28 May '14

From: Fabio Estevam <fabio.estevam(a)freescale.com> When building a target with CONFIG_ENV_IS_IN_SPI_FLASH the following build warning is seen: include/configs/mx28evk.h:73:0: warning: "CONFIG_ENV_SIZE" redefined [enabled by default] Each target has its own CONFIG_ENV_SIZE definition, so remove the one that does not belong to any target. While at it, fix a typo. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - None include/configs/mx28evk.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 9b9124a..e5370f3 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -48,7 +48,6 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Environment */ -#define CONFIG_ENV_SIZE (16 * 1024) #define CONFIG_ENV_OVERWRITE /* Environment is in MMC */ @@ -67,7 +66,7 @@ (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) #endif -/* Environemnt is in SPI flash */ +/* Environment is in SPI flash */ #if defined(CONFIG_CMD_SF) && defined(CONFIG_ENV_IS_IN_SPI_FLASH) #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SIZE 0x1000 /* 4KB */ -- 1.8.3.2

2 5

[U-Boot] [PATCH] mx6sabreauto: Add the mx6dual-lite variant
by Fabio Estevam 28 May '14

28 May '14

Tested by booting a mainline kernel via TFTP. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- board/freescale/mx6qsabreauto/mx6dl.cfg | 130 ++++++++++++++++++++++++++++++++ boards.cfg | 1 + include/configs/mx6qsabreauto.h | 4 + 3 files changed, 135 insertions(+) create mode 100644 board/freescale/mx6qsabreauto/mx6dl.cfg diff --git a/board/freescale/mx6qsabreauto/mx6dl.cfg b/board/freescale/mx6qsabreauto/mx6dl.cfg new file mode 100644 index 0000000..89078e5 --- /dev/null +++ b/board/freescale/mx6qsabreauto/mx6dl.cfg @@ -0,0 +1,130 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. + * Jason Liu <r64343(a)freescale.com> + * + * SPDX-License-Identifier: GPL-2.0+ + * + * Refer doc/README.imximage for more details about how-to configure + * and create imximage boot image + * + * The syntax is taken as close as possible with the kwbimage + */ +/* image version */ + +IMAGE_VERSION 2 + +/* + * Boot Device : one of + * spi, sd (the board has no nand neither onenand) + */ +BOOT_FROM sd + +/* + * Device Configuration Data (DCD) + * + * Each entry must have the format: + * Addr-type Address Value + * + * where: + * Addr-type register length (1,2 or 4 bytes) + * Address absolute address of the register + * value value to be stored in the register + */ +DATA 4 0x020e0774 0x000C0000 +DATA 4 0x020e0754 0x00000000 +DATA 4 0x020e04ac 0x00000030 +DATA 4 0x020e04b0 0x00000030 +DATA 4 0x020e0464 0x00000030 +DATA 4 0x020e0490 0x00000030 +DATA 4 0x020e074c 0x00000030 +DATA 4 0x020e0494 0x00000030 +DATA 4 0x020e04a0 0x00000000 +DATA 4 0x020e04b4 0x00000030 +DATA 4 0x020e04b8 0x00000030 +DATA 4 0x020e076c 0x00000030 +DATA 4 0x020e0750 0x00020000 +DATA 4 0x020e04bc 0x00000028 +DATA 4 0x020e04c0 0x00000028 +DATA 4 0x020e04c4 0x00000028 +DATA 4 0x020e04c8 0x00000028 +DATA 4 0x020e04cc 0x00000028 +DATA 4 0x020e04d0 0x00000028 +DATA 4 0x020e04d4 0x00000028 +DATA 4 0x020e04d8 0x00000028 +DATA 4 0x020e0760 0x00020000 +DATA 4 0x020e0764 0x00000028 +DATA 4 0x020e0770 0x00000028 +DATA 4 0x020e0778 0x00000028 +DATA 4 0x020e077c 0x00000028 +DATA 4 0x020e0780 0x00000028 +DATA 4 0x020e0784 0x00000028 +DATA 4 0x020e078c 0x00000028 +DATA 4 0x020e0748 0x00000028 +DATA 4 0x020e0470 0x00000028 +DATA 4 0x020e0474 0x00000028 +DATA 4 0x020e0478 0x00000028 +DATA 4 0x020e047c 0x00000028 +DATA 4 0x020e0480 0x00000028 +DATA 4 0x020e0484 0x00000028 +DATA 4 0x020e0488 0x00000028 +DATA 4 0x020e048c 0x00000028 +DATA 4 0x021b0800 0xa1390003 +DATA 4 0x021b080c 0x001F001F +DATA 4 0x021b0810 0x001F001F +DATA 4 0x021b480c 0x001F001F +DATA 4 0x021b4810 0x001F001F +DATA 4 0x021b083c 0x42190217 +DATA 4 0x021b0840 0x017B017B +DATA 4 0x021b483c 0x4176017B +DATA 4 0x021b4840 0x015F016C +DATA 4 0x021b0848 0x4C4C4D4C +DATA 4 0x021b4848 0x4A4D4C48 +DATA 4 0x021b0850 0x3F3F3F40 +DATA 4 0x021b4850 0x3538382E +DATA 4 0x021b081c 0x33333333 +DATA 4 0x021b0820 0x33333333 +DATA 4 0x021b0824 0x33333333 +DATA 4 0x021b0828 0x33333333 +DATA 4 0x021b481c 0x33333333 +DATA 4 0x021b4820 0x33333333 +DATA 4 0x021b4824 0x33333333 +DATA 4 0x021b4828 0x33333333 +DATA 4 0x021b08b8 0x00000800 +DATA 4 0x021b48b8 0x00000800 +DATA 4 0x021b0004 0x00020025 +DATA 4 0x021b0008 0x00333030 +DATA 4 0x021b000c 0x676B5313 +DATA 4 0x021b0010 0xB66E8B63 +DATA 4 0x021b0014 0x01FF00DB +DATA 4 0x021b0018 0x00001740 +DATA 4 0x021b001c 0x00008000 +DATA 4 0x021b002c 0x000026d2 +DATA 4 0x021b0030 0x006B1023 +DATA 4 0x021b0040 0x00000047 +DATA 4 0x021b0000 0x841A0000 +DATA 4 0x021b001c 0x04008032 +DATA 4 0x021b001c 0x00008033 +DATA 4 0x021b001c 0x00048031 +DATA 4 0x021b001c 0x05208030 +DATA 4 0x021b001c 0x04008040 +DATA 4 0x021b0020 0x00005800 +DATA 4 0x021b0818 0x00011117 +DATA 4 0x021b4818 0x00011117 +DATA 4 0x021b0004 0x00025565 +DATA 4 0x021b0404 0x00011006 +DATA 4 0x021b001c 0x00000000 + +/* set the default clock gate to save power */ +DATA 4 0x020c4068 0x00C03F3F +DATA 4 0x020c406c 0x0030FC03 +DATA 4 0x020c4070 0x0FFFC000 +DATA 4 0x020c4074 0x3FF00000 +DATA 4 0x020c4078 0xFFFFF300 +DATA 4 0x020c407c 0x0F0000C3 +DATA 4 0x020c4080 0x00000FFF + +/* enable AXI cache for VDOA/VPU/IPU */ +DATA 4 0x020e0010 0xF00000CF +/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ +DATA 4 0x020e0018 0x007F007F +DATA 4 0x020e001c 0x007F007F diff --git a/boards.cfg b/boards.cfg index 89ed095..514970e 100644 --- a/boards.cfg +++ b/boards.cfg @@ -320,6 +320,7 @@ Active arm armv7 mx6 boundary nitrogen6x Active arm armv7 mx6 congatec cgtqmx6eval cgtqmx6qeval cgtqmx6eval:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q Leo Sartre <lsartre(a)adeneo-embedded.com> Active arm armv7 mx6 freescale mx6qarm2 mx6qarm2 mx6qarm2:IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg Jason Liu <r64343(a)freescale.com> Active arm armv7 mx6 freescale mx6qsabreauto mx6qsabreauto mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q Fabio Estevam <fabio.estevam(a)freescale.com> +Active arm armv7 mx6 freescale mx6qsabreauto mx6dlsabreauto mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL Fabio Estevam <fabio.estevam(a)freescale.com> Active arm armv7 mx6 freescale mx6sabresd mx6dlsabresd mx6sabresd:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL Fabio Estevam <fabio.estevam(a)freescale.com> Active arm armv7 mx6 freescale mx6sabresd mx6qsabresd mx6sabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q Fabio Estevam <fabio.estevam(a)freescale.com> Active arm armv7 mx6 freescale mx6slevk mx6slevk mx6slevk:IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL Fabio Estevam <fabio.estevam(a)freescale.com> diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index bd0144f..d1639c4 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -12,7 +12,11 @@ #define CONFIG_MACH_TYPE 3529 #define CONFIG_MXC_UART_BASE UART4_BASE #define CONFIG_CONSOLE_DEV "ttymxc3" +#if defined CONFIG_MX6Q #define CONFIG_DEFAULT_FDT_FILE "imx6q-sabreauto.dtb" +#elif defined CONFIG_MX6DL +#define CONFIG_DEFAULT_FDT_FILE "imx6dl-sabreauto.dtb" +#endif #define CONFIG_MMCROOT "/dev/mmcblk0p2" #define PHYS_SDRAM_SIZE (2u * 1024 * 1024 * 1024) -- 1.8.3.2

3 3

[U-Boot] Protected variable 'ethaddr' can be reset to default value (or deleted)
by Hector Palacios 28 May '14

28 May '14

Hello, I have enabled environment flags and have protected "ethaddr" variable in write-once mode: "ethaddr:mo". As expected, once set, I cannot overwrite this variable with standard setenv command. Also as expected, I can overwrite it at any time by passing the -f (forced) option to setenv: setenv -f ethaddr XX:XX:XX:XX:XX:XX The 'env default' command is supposed to reset the environment to the default values. Its help is: env default [-f] -a - [forcibly] reset default environment env default [-f] var [...] - [forcibly] reset variable(s) to their default values So I expect that 'env default ethaddr' does not change the value of 'ethaddr' (which actually occurs) because the variable is protected, but that adding the -f option does change the value to the default (which doesn't occur). In other words: env default ethaddr Does not change 'ethaddr' (OK) env default -f ethaddr Does not change 'ethaddr' (Problem #1) Similarly, I was also expecting that 'env default -a', which resets the whole environment to its default values, does not modify protected 'ethaddr' (like it happens when you specify the variable) and that 'env default -f -a' resets it. However, both commands do reset the protected variables. In other words: env default -a Changes/deletes 'ethaddr' (Problem #2) env default -f -a Changes/deletes 'ethaddr' (OK) Actually the '-f' option, despite being in the help text is not taken into consideration at the 'default' subcommand. This can easily be checked in function do_env_default() in common/cmd_nvedit.c, where the local variable 'flag' is not propagated anywhere in the function. I can easily fix Problem #1 by propagating local variable 'flag' in do_env_default() to set_default_vars(). Problem #2 is more difficult because U-Boot is creating a new env table from scratch, disregarding previous existing entries, and calling env_flags_validate() in 'env_op_create' mode, which only checks for ENV_FLAGS_VARACCESS_PREVENT_CREATE permission. Any ideas on how to properly fix this? Best regards, -- Hector Palacios

1 0

Re: [U-Boot] [PATCH v4] arm: Add support for semihosting for armv8 fastmodel targets.
by Sakar.Arora＠freescale.com 28 May '14

28 May '14

Correcting Darwin's email id. Sorry for the typo :). -----Original Message----- From: Arora Sakar-B45205 Sent: Wednesday, May 28, 2014 1:16 PM To: 'dambo(a)broadcom.com'; 'u-boot(a)lists.denx.de' Cc: Sharma Bhupesh-B45370; 'trini(a)ti.com'; 'fenghua(a)phytium.com.cn'; 'albert.u.boot(a)aribaud.net' Subject: RE: [PATCH v4] arm: Add support for semihosting for armv8 fastmodel targets. Hi Darwin Thanks for the patch. > -----Original Message----- > From: Darwin Rambo [mailto:drambo@broadcom.com] > Sent: Saturday, May 24, 2014 5:08 AM > To: u-boot(a)lists.denx.de > Cc: Darwin Rambo; trini(a)ti.com; fenghua(a)phytium.com.cn; Sharma > Bhupesh- B45370; Albert Aribaud > Subject: [PATCH v4] arm: Add support for semihosting for armv8 > fastmodel targets. > > The reason for this change is to be able to use the ARM Trusted > Firmware > (ATF) to load the various ATF images, plus u-boot, which can then load > the kernel/ramdisk/dtb with calls to an external host from a standard > fastmodel armv8 board file using semihosting, and then launch the > kernel without a bootwrapper. This gives us a more realistic boot sequence. > > There are two main ARM virtual Fixed Virtual Platform (FVP) models, > Versatile Express (VE) FVP and BASE FVP (See > http://www.arm.com/products/tools/models/fast-models/foundation- > model.php) > The initial vexpress64 u-boot board created here runs on the VE > virtual platform using the license-free Foundation_v8 simulator. > Fortunately, the > Foundation_v8 simulator also supports the BASE_FVP model which > companies can purchase licenses for and contain much more functionality. > So we can, in u-boot, run either model by either using the VE FVP > (default), or turning on CONFIG_BASE_FVP for the more full featured > model. > > Rather than create a new armv8 board similar to armltd/vexpress64, add > semihosting calls to the existing one, enabled with CONFIG_SEMIHOSTING > and CONFIG_BASE_FVP both set. Also reuse the existing board config > file vexpress_aemv8a.h but differentiate the two models by the > presence or absence of CONFIG_BASE_FVP. This change is tested and > works on both the Foundation and Base fastmodel simulators. > > Support for armv7 in fastmodel is less useful due to the wide range of > available silicon and the lack of a free armv7 fastmodel, so this > change contains an untested armv7 placeholder for the service trap opcode. > > The level of semihosting support is minimal, restricted to just what > it takes to load images to memory. If more semihosting functionality > is required, such as file seek, outputting strings, reading > characters, etc, then it can be easily added later. > > Signed-off-by: Darwin Rambo <drambo(a)broadcom.com> > Cc: trini(a)ti.com > Cc: fenghua(a)phytium.com.cn > Cc: bhupesh.sharma(a)freescale.com > Tested with latest ATF, u-boot(master) with this patch, and ARMv8 Foundation model 52rel06. Tested-by: Sakar Arora <sakar.arora(a)freescale.com> Regards, Sakar > --- > > Changes in v4: > - refreshed patch and retested > - fix boards.cfg conflict > - fix GICV3 conflict > - minor documentation cleanup - semihosting.c, README.semihosting > - change maintainer of semihosting target > - tested with vexpress_aemv8a_semi target (BASE_FVP) against > e75e73dd5f280b91f5bfc0a76a0fd09b6eba1c66 (May 16, 2014) > > Changes in v3: > - minor format fixup in board file > > Changes in v2: > - use kernel_addr_r, fdt_addr_r, initrd_addr_r convention. > - Use env variables for kernel/fdt/initrd file names. > - Add CONFIG_BASE_FVP to differentiate VE and BASE FVP models. > - CONFIG_SEMIHOSTING only refers to bringing in semihosting code now. > - Remove unnecessary CONFIG_SYS_BAUDRATE_TABLE, > CONFIG_SYS_PROMPT_HUSH_PS2 > - Remove vexpress_aemv8a_semi.h and replace with CONFIG_BASE_FVP > - Update boards.cfg with option SEMIHOSTING and BASE_FVP > - Add doc/README.semihosting > > Changes in v1: > - Initial code > - Remove empty timer_init() function. > > arch/arm/include/asm/semihosting.h | 21 +++ > arch/arm/lib/Makefile | 1 + > arch/arm/lib/semihosting.c | 233 > ++++++++++++++++++++++++++++++++++ > board/armltd/vexpress64/vexpress64.c | 101 ++++++++++++++- > boards.cfg | 1 + > doc/README.semihosting | 35 +++++ > include/configs/vexpress_aemv8a.h | 63 ++++++++- > 7 files changed, 443 insertions(+), 12 deletions(-) create mode > 100644 arch/arm/include/asm/semihosting.h > create mode 100644 arch/arm/lib/semihosting.c create mode 100644 > doc/README.semihosting > > diff --git a/arch/arm/include/asm/semihosting.h > b/arch/arm/include/asm/semihosting.h > new file mode 100644 > index 0000000..74111dc > --- /dev/null > +++ b/arch/arm/include/asm/semihosting.h > @@ -0,0 +1,21 @@ > +/* > + * Copyright 2014 Broadcom Corporation > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +#ifndef __SEMIHOSTING_H__ > +#define __SEMIHOSTING_H__ > + > +/* > + * ARM semihosting functions for loading images to memory. See the > +source > + * code for more information. > + */ > +int smh_load(const char *fname, void *memp, int avail, int verbose); > +int smh_read(int fd, void *memp, int len); int smh_open(const char > +*fname, char *modestr); int smh_close(int fd); int smh_len_fd(int > +fd); int smh_len(const char *fname); > + > +#endif /* __SEMIHOSTING_H__ */ > diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index > 585f1f7..1ef2400 100644 > --- a/arch/arm/lib/Makefile > +++ b/arch/arm/lib/Makefile > @@ -32,6 +32,7 @@ obj-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o else > obj-$(CONFIG_SPL_FRAMEWORK) += spl.o > endif > +obj-$(CONFIG_SEMIHOSTING) += semihosting.o > > obj-y += sections.o > ifdef CONFIG_ARM64 > diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c > new file mode 100644 index 0000000..cb5dc26 > --- /dev/null > +++ b/arch/arm/lib/semihosting.c > @@ -0,0 +1,233 @@ > +/* > + * Copyright 2014 Broadcom Corporation > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +/* > + * Minimal semihosting implementation for reading files into memory. > +If more > + * features like writing files or console output are required they > +can be > + * added later. This code has been tested on arm64/aarch64 fastmodel > only. > + * An untested placeholder exists for armv7 architectures, but since > +they > + * are commonly available in silicon now, fastmodel usage makes less > +sense > + * for them. > + */ > +#include <common.h> > +#include <asm/semihosting.h> > + > +#define SYSOPEN 0x01 > +#define SYSCLOSE 0x02 > +#define SYSREAD 0x06 > +#define SYSFLEN 0x0C > + > +#define MODE_READ 0x0 > +#define MODE_READBIN 0x1 > + > +/* > + * Call the handler > + */ > +static int smh_trap(unsigned int sysnum, void *addr) { > + register int result asm("r0"); > +#if defined(CONFIG_ARM64) > + asm volatile ("hlt #0xf000" : "=r" (result) : "0"(sysnum), > "r"(addr)); > +#else > + /* Note - untested placeholder */ > + asm volatile ("svc #0x123456" : "=r" (result) : "0"(sysnum), > +"r"(addr)); #endif > + return result; > +} > + > +/* > + * Open, load a file into memory, and close it. Check that the > +available space > + * is sufficient to store the entire file. Return the bytes actually > +read from > + * the file as seen by the read function. The verbose flag enables > +some extra > + * printing of successful read status. > + */ > +int smh_load(const char *fname, void *memp, int avail, int verbose) { > + int ret, fd, len; > + > + ret = -1; > + > + debug("%s: fname \'%s\', avail %u, memp %p\n", __func__, fname, > + avail, memp); > + > + /* Open the file */ > + fd = smh_open(fname, "rb"); > + if (fd == -1) > + return ret; > + > + /* Get the file length */ > + ret = smh_len_fd(fd); > + if (ret == -1) { > + smh_close(fd); > + return ret; > + } > + > + /* Check that the file will fit in the supplied buffer */ > + if (ret > avail) { > + printf("%s: ERROR ret %d, avail %u\n", __func__, ret, > + avail); > + smh_close(fd); > + return ret; > + } > + > + len = ret; > + > + /* Read the file into the buffer */ > + ret = smh_read(fd, memp, len); > + if (ret == 0) { > + /* Print successful load information if requested */ > + if (verbose) { > + printf("\n%s\n", fname); > + printf(" 0x%8p dest\n", memp); > + printf(" 0x%08x size\n", len); > + printf(" 0x%08x avail\n", avail); > + } > + } > + > + /* Close the file */ > + smh_close(fd); > + > + return ret; > +} > + > +/* > + * Read 'len' bytes of file into 'memp'. Returns 0 on success, else > +failure */ int smh_read(int fd, void *memp, int len) { > + int ret; > + struct smh_read_s { > + int fd; > + void *memp; > + int len; > + } read; > + > + debug("%s: fd %d, memp %p, len %d\n", __func__, fd, memp, len); > + > + read.fd = fd; > + read.memp = memp; > + read.len = len; > + > + ret = smh_trap(SYSREAD, &read); > + if (ret == 0) { > + return 0; > + } else { > + /* > + * The ARM handler allows for returning partial lengths, > + * but in practice this never happens so rather than create > + * hard to maintain partial read loops and such, just fail > + * with an error message. > + */ > + printf("%s: ERROR ret %d, fd %d, len %u memp %p\n", > + __func__, ret, fd, len, memp); > + } > + return ret; > +} > + > +/* > + * Open a file on the host. Mode is "r" or "rb" currently. Returns a > +file > + * descriptor or -1 on error. > + */ > +int smh_open(const char *fname, char *modestr) { > + int ret, fd, mode; > + struct smh_open_s { > + const char *fname; > + unsigned int mode; > + unsigned int len; > + } open; > + > + debug("%s: file \'%s\', mode \'%s\'\n", __func__, fname, modestr); > + > + ret = -1; > + > + /* Check the file mode */ > + if (!(strcmp(modestr, "r"))) { > + mode = MODE_READ; > + } else if (!(strcmp(modestr, "rb"))) { > + mode = MODE_READBIN; > + } else { > + printf("%s: ERROR mode \'%s\' not supported\n", __func__, > + modestr); > + return ret; > + } > + > + open.fname = fname; > + open.len = strlen(fname); > + open.mode = mode; > + > + /* Open the file on the host */ > + fd = smh_trap(SYSOPEN, &open); > + if (fd == -1) > + printf("%s: ERROR fd %d for file \'%s\'\n", __func__, fd, > + fname); > + > + return fd; > +} > + > +/* > + * Close the file using the file descriptor */ int smh_close(int fd) { > + int ret; > + long fdlong; > + > + debug("%s: fd %d\n", __func__, fd); > + > + fdlong = (long)fd; > + ret = smh_trap(SYSCLOSE, &fdlong); > + if (ret == -1) > + printf("%s: ERROR fd %d\n", __func__, fd); > + > + return ret; > +} > + > +/* > + * Get the file length from the file descriptor */ int > +smh_len_fd(int > +fd) { > + int ret; > + long fdlong; > + > + debug("%s: fd %d\n", __func__, fd); > + > + fdlong = (long)fd; > + ret = smh_trap(SYSFLEN, &fdlong); > + if (ret == -1) > + printf("%s: ERROR ret %d\n", __func__, ret); > + > + return ret; > +} > + > +/* > + * Get the file length from the filename */ int smh_len(const char > +*fname) { > + int ret, fd, len; > + > + debug("%s: file \'%s\'\n", __func__, fname); > + > + /* Open the file */ > + fd = smh_open(fname, "rb"); > + if (fd == -1) > + return fd; > + > + /* Get the file length */ > + len = smh_len_fd(fd); > + > + /* Close the file */ > + ret = smh_close(fd); > + if (ret == -1) > + return ret; > + > + debug("%s: returning len %d\n", __func__, len); > + > + /* Return the file length (or -1 error indication) */ > + return len; > +} > diff --git a/board/armltd/vexpress64/vexpress64.c > b/board/armltd/vexpress64/vexpress64.c > index 2ec3bc9..5897318 100644 > --- a/board/armltd/vexpress64/vexpress64.c > +++ b/board/armltd/vexpress64/vexpress64.c > @@ -11,6 +11,7 @@ > #include <netdev.h> > #include <asm/io.h> > #include <linux/compiler.h> > +#include <asm/semihosting.h> > > DECLARE_GLOBAL_DATA_PTR; > > @@ -31,11 +32,6 @@ int dram_init(void) > return 0; > } > > -int timer_init(void) > -{ > - return 0; > -} > - > /* > * Board specific reset that is system reset. > */ > @@ -43,6 +39,101 @@ void reset_cpu(ulong addr) { } > > +#ifdef CONFIG_BOARD_LATE_INIT > +int board_late_init(void) > +{ > +#ifdef CONFIG_SEMIHOSTING > + /* > + * Please refer to doc/README.semihosting for a more complete > + * description. > + * > + * We require that the board include file defines these env > variables: > + * - kernel_name > + * - kernel_addr_r > + * - initrd_name > + * - initrd_addr_r > + * - fdt_name > + * - fdt_addr_r > + * > + * For the "fdt chosen" startup macro, this code will then define: > + * - initrd_end (based on initrd_addr_r plus actual initrd_size) > + * > + * We will then load the kernel, initrd, and fdt into the specified > + * locations in memory in a similar way that the ATF fastmodel code > + * uses semihosting calls to load other boot stages and u-boot > itself. > + */ > + > + /* Env variable strings */ > + char *kernel_name = getenv("kernel_name"); > + char *kernel_addr_str = getenv("kernel_addr_r"); > + char *initrd_name = getenv("initrd_name"); > + char *initrd_addr_str = getenv("initrd_addr_r"); > + char *fdt_name = getenv("fdt_name"); > + char *fdt_addr_str = getenv("fdt_addr_r"); > + char initrd_end_str[64]; > + > + /* Actual addresses converted from env variables */ > + void *kernel_addr_r; > + void *initrd_addr_r; > + void *fdt_addr_r; > + > + /* Actual initrd base and size */ > + unsigned long initrd_base; > + unsigned long initrd_size; > + > + /* Space available */ > + int avail; > + > + /* Make sure the environment variables needed are set */ > + if (!(kernel_addr_str && initrd_addr_str && fdt_addr_str)) { > + printf("%s: Define {kernel/initrd/fdt}_addr_r\n", __func__); > + return -1; > + } > + if (!(kernel_name && initrd_name && fdt_name)) { > + printf("%s: Define {kernel/initrd/fdt}_name\n", __func__); > + return -1; > + } > + > + /* Get exact initrd_size */ > + initrd_size = smh_len(initrd_name); > + if (initrd_size == -1) { > + printf("%s: Can't get file size for \'%s\'\n", __func__, > + initrd_name); > + return -1; > + } > + > + /* Set initrd_end */ > + initrd_base = simple_strtoul(initrd_addr_str, NULL, 16); > + initrd_addr_r = (void *)initrd_base; > + sprintf(initrd_end_str, "0x%lx", initrd_base + initrd_size - 1); > + setenv("initrd_end", initrd_end_str); > + > + /* Load kernel to memory */ > + fdt_addr_r = (void *)simple_strtoul(fdt_addr_str, NULL, 16); > + kernel_addr_r = (void *)simple_strtoul(kernel_addr_str, NULL, 16); > + > + /* > + * The kernel must be lower in memory than fdt and loading the > + * kernel must not trample the fdt or vice versa. > + */ > + avail = fdt_addr_r - kernel_addr_r; > + if (avail < 0) { > + printf("%s: fdt must be after kernel\n", __func__); > + return -1; > + } > + smh_load(kernel_name, kernel_addr_r, avail, 1); > + > + /* Load fdt to memory */ > + smh_load(fdt_name, fdt_addr_r, 0x20000, 1); > + > + /* Load initrd to memory */ > + smh_load(initrd_name, initrd_addr_r, initrd_size, 1); > + > +#endif /* CONFIG_SEMIHOSTING */ > + return 0; > +} > +#endif /* CONFIG_BOARD_LATE_INIT */ > + > /* > * Board specific ethernet initialization routine. > */ > diff --git a/boards.cfg b/boards.cfg > index 440c312..16b9e79 100644 > --- a/boards.cfg > +++ b/boards.cfg > @@ -44,6 +44,7 @@ > > ###################################################################### > ### > ################################## > > Active aarch64 armv8 - armltd > vexpress64 vexpress_aemv8a > vexpress_aemv8a:ARM64 > David Feng <fenghua(a)phytium.com.cn> > +Active aarch64 armv8 - armltd > vexpress64 vexpress_aemv8a_semi > vexpress_aemv8a:ARM64,SEMIHOSTING,BASE_FVP > Steve Rae <srae(a)broadcom.com> > Active arc arc700 - synopsys - > axs101 - > Alexey Brodkin <abrodkin(a)synopsys.com> > Active arc arc700 - synopsys <none> > arcangel4 - > Alexey Brodkin <abrodkin(a)synopsys.com> > Active arc arc700 - synopsys <none> > arcangel4-be - > Alexey Brodkin <abrodkin(a)synopsys.com> diff --git > a/doc/README.semihosting b/doc/README.semihosting new file mode 100644 > index 0000000..a37feb1 > --- /dev/null > +++ b/doc/README.semihosting > @@ -0,0 +1,35 @@ > +/* > + * Copyright 2014 Broadcom Corporation. > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +Semihosting is ARM's way of having a real or virtual target > +communicate with a host or host debugger for basic operations such as > +file I/O, console I/O, etc. Please see > +http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0471c/ > +Bgb > jjgij.html for more information. > + > +For developing on armv8 virtual fastmodel platforms, semihosting is a > +valuable tool since it allows access to image/configuration files > +before eMMC or other NV media are available. > + > +For reference, the current target vexpress_aemv8a_semi enables > +CONFIG_SEMIHOSTING and CONFIG_BASE_FVP for the "vexpress_aemv8a" board. > + > +We require that the board include file define these env variables: > +- kernel_name e.g. "uImage" > +- kernel_addr_r e.g. "0x80000000" > +- initrd_name e.g. "ramdisk.img" > +- initrd_addr_r e.g. "0x88000000" > +- fdt_name e.g. "devtree.dtb" > +- fdt_addr_r e.g. "0x83000000" > + > +Optionally, "fdt_high" and "initrd_high" can be specified as per > +their rules for allowing or preventing copying of these images. > + > +For the "fdt chosen" startup macro, this code will then define: > +- initrd_end (based on retrieving initrd_addr_r plus actual > +initrd_size) > + > +We will then load the kernel, initrd, and fdt into the specified > +locations in memory in a similar way that the ATF fastmodel code uses > +semihosting calls to load other boot stages and u-boot itself. > diff --git a/include/configs/vexpress_aemv8a.h > b/include/configs/vexpress_aemv8a.h > index dff6adc..1905d13 100644 > --- a/include/configs/vexpress_aemv8a.h > +++ b/include/configs/vexpress_aemv8a.h > @@ -10,9 +10,20 @@ > > #define DEBUG > > +#ifdef CONFIG_BASE_FVP > +#ifndef CONFIG_SEMIHOSTING > +#error CONFIG_BASE_FVP requires CONFIG_SEMIHOSTING #endif #define > +CONFIG_BOARD_LATE_INIT #define CONFIG_ARMV8_SWITCH_TO_EL1 #endif > + > #define CONFIG_REMAKE_ELF > > +#ifndef CONFIG_BASE_FVP > +/* Base FVP not using GICv3 yet */ > #define CONFIG_GICV3 > +#endif > > /*#define CONFIG_ARMV8_SWITCH_TO_EL1*/ > > @@ -30,8 +41,14 @@ > #define CONFIG_BOOTP_VCI_STRING "U-boot.armv8.vexpress_aemv8a" > > /* Link Definitions */ > +#ifdef CONFIG_BASE_FVP > +/* ATF loads u-boot here for BASE_FVP model */ > +#define CONFIG_SYS_TEXT_BASE 0x88000000 > +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + > 0x03f00000) > +#else > #define CONFIG_SYS_TEXT_BASE 0x80000000 > #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + > 0x7fff0) > +#endif > > /* Flat Device Tree Definitions */ > #define CONFIG_OF_LIBFDT > @@ -39,7 +56,11 @@ > #define CONFIG_DEFAULT_DEVICE_TREE vexpress64 > > /* SMP Spin Table Definitions */ > +#ifdef CONFIG_BASE_FVP > +#define CPU_RELEASE_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000) > +#else > #define CPU_RELEASE_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) > +#endif > > /* CS register bases for the original memory map. */ > #define V2M_PA_CS0 0x00000000 > @@ -99,9 +120,15 @@ > #define GICD_BASE (0x2f000000) > #define GICR_BASE (0x2f100000) > #else > + > +#ifdef CONFIG_BASE_FVP > +#define GICD_BASE (0x2f000000) > +#define GICC_BASE (0x2c000000) > +#else > #define GICD_BASE (0x2C001000) > #define GICC_BASE (0x2C002000) > #endif > +#endif > > #define CONFIG_SYS_MEMTEST_START V2M_BASE > #define CONFIG_SYS_MEMTEST_END (V2M_BASE + 0x80000000) > @@ -121,7 +148,6 @@ > #define CONFIG_CONS_INDEX 0 > > #define CONFIG_BAUDRATE 115200 > -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } > #define CONFIG_SYS_SERIAL0 V2M_UART0 > #define CONFIG_SYS_SERIAL1 V2M_UART1 > > @@ -165,17 +191,41 @@ > #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 > > /* Initial environment variables */ > +#ifdef CONFIG_BASE_FVP > +#define CONFIG_EXTRA_ENV_SETTINGS \ > + "kernel_name=uImage\0" \ > + "kernel_addr_r=0x80000000\0" \ > + "initrd_name=ramdisk.img\0" \ > + "initrd_addr_r=0x88000000\0" \ > + "fdt_name=devtree.dtb\0" \ > + "fdt_addr_r=0x83000000\0" \ > + "fdt_high=0xffffffffffffffff\0" \ > + "initrd_high=0xffffffffffffffff\0" > + > +#define CONFIG_BOOTARGS "console=ttyAMA0 earlyprintk=pl011,"\ > + "0x1c090000 debug user_debug=31 "\ > + "loglevel=9" > + > +#define CONFIG_BOOTCOMMAND "fdt addr $fdt_addr_r; fdt resize; " \ > + "fdt chosen $initrd_addr_r $initrd_end; " \ > + "bootm $kernel_addr_r - $fdt_addr_r" > + > +#define CONFIG_BOOTDELAY 1 > + > +#else > + > #define CONFIG_EXTRA_ENV_SETTINGS \ > - "kernel_addr=0x200000\0" \ > - "initrd_addr=0xa00000\0" \ > + "kernel_addr_r=0x200000\0" \ > + "initrd_addr_r=0xa00000\0" \ > "initrd_size=0x2000000\0" \ > - "fdt_addr=0x100000\0" \ > + "fdt_addr_r=0x100000\0" \ > "fdt_high=0xa0000000\0" > > #define CONFIG_BOOTARGS "console=ttyAMA0 > root=/dev/ram0" > -#define CONFIG_BOOTCOMMAND "bootm $kernel_addr " \ > - "$initrd_addr:$initrd_size $fdt_addr" > +#define CONFIG_BOOTCOMMAND "bootm $kernel_addr_r " \ > + "$initrd_addr_r:$initrd_size $fdt_addr_r" > #define CONFIG_BOOTDELAY -1 > +#endif > > /* Do not preserve environment */ > #define CONFIG_ENV_IS_NOWHERE 1 > @@ -187,7 +237,6 @@ > #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ > sizeof(CONFIG_SYS_PROMPT) + 16) > #define CONFIG_SYS_HUSH_PARSER > -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " > #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE > #define CONFIG_SYS_LONGHELP > #define CONFIG_CMDLINE_EDITING 1 > -- > 1.7.9.5

1 0

Re: [U-Boot] [PATCH v4] arm: Add support for semihosting for armv8 fastmodel targets.
by Sakar.Arora＠freescale.com 28 May '14

28 May '14

Hi Darwin Thanks for the patch. > -----Original Message----- > From: Darwin Rambo [mailto:drambo@broadcom.com] > Sent: Saturday, May 24, 2014 5:08 AM > To: u-boot(a)lists.denx.de > Cc: Darwin Rambo; trini(a)ti.com; fenghua(a)phytium.com.cn; Sharma > Bhupesh- B45370; Albert Aribaud > Subject: [PATCH v4] arm: Add support for semihosting for armv8 > fastmodel targets. > > The reason for this change is to be able to use the ARM Trusted > Firmware > (ATF) to load the various ATF images, plus u-boot, which can then load > the kernel/ramdisk/dtb with calls to an external host from a standard > fastmodel armv8 board file using semihosting, and then launch the > kernel without a bootwrapper. This gives us a more realistic boot sequence. > > There are two main ARM virtual Fixed Virtual Platform (FVP) models, > Versatile Express (VE) FVP and BASE FVP (See > http://www.arm.com/products/tools/models/fast-models/foundation- > model.php) > The initial vexpress64 u-boot board created here runs on the VE > virtual platform using the license-free Foundation_v8 simulator. > Fortunately, the > Foundation_v8 simulator also supports the BASE_FVP model which > companies can purchase licenses for and contain much more functionality. > So we can, in u-boot, run either model by either using the VE FVP > (default), or turning on CONFIG_BASE_FVP for the more full featured > model. > > Rather than create a new armv8 board similar to armltd/vexpress64, add > semihosting calls to the existing one, enabled with CONFIG_SEMIHOSTING > and CONFIG_BASE_FVP both set. Also reuse the existing board config > file vexpress_aemv8a.h but differentiate the two models by the > presence or absence of CONFIG_BASE_FVP. This change is tested and > works on both the Foundation and Base fastmodel simulators. > > Support for armv7 in fastmodel is less useful due to the wide range of > available silicon and the lack of a free armv7 fastmodel, so this > change contains an untested armv7 placeholder for the service trap opcode. > > The level of semihosting support is minimal, restricted to just what > it takes to load images to memory. If more semihosting functionality > is required, such as file seek, outputting strings, reading > characters, etc, then it can be easily added later. > > Signed-off-by: Darwin Rambo <drambo(a)broadcom.com> > Cc: trini(a)ti.com > Cc: fenghua(a)phytium.com.cn > Cc: bhupesh.sharma(a)freescale.com > Tested with latest ATF, u-boot(master) with this patch, and ARMv8 Foundation model 52rel06. Tested-by: Sakar Arora <sakar.arora(a)freescale.com> Regards, Sakar > --- > > Changes in v4: > - refreshed patch and retested > - fix boards.cfg conflict > - fix GICV3 conflict > - minor documentation cleanup - semihosting.c, README.semihosting > - change maintainer of semihosting target > - tested with vexpress_aemv8a_semi target (BASE_FVP) against > e75e73dd5f280b91f5bfc0a76a0fd09b6eba1c66 (May 16, 2014) > > Changes in v3: > - minor format fixup in board file > > Changes in v2: > - use kernel_addr_r, fdt_addr_r, initrd_addr_r convention. > - Use env variables for kernel/fdt/initrd file names. > - Add CONFIG_BASE_FVP to differentiate VE and BASE FVP models. > - CONFIG_SEMIHOSTING only refers to bringing in semihosting code now. > - Remove unnecessary CONFIG_SYS_BAUDRATE_TABLE, > CONFIG_SYS_PROMPT_HUSH_PS2 > - Remove vexpress_aemv8a_semi.h and replace with CONFIG_BASE_FVP > - Update boards.cfg with option SEMIHOSTING and BASE_FVP > - Add doc/README.semihosting > > Changes in v1: > - Initial code > - Remove empty timer_init() function. > > arch/arm/include/asm/semihosting.h | 21 +++ > arch/arm/lib/Makefile | 1 + > arch/arm/lib/semihosting.c | 233 > ++++++++++++++++++++++++++++++++++ > board/armltd/vexpress64/vexpress64.c | 101 ++++++++++++++- > boards.cfg | 1 + > doc/README.semihosting | 35 +++++ > include/configs/vexpress_aemv8a.h | 63 ++++++++- > 7 files changed, 443 insertions(+), 12 deletions(-) create mode > 100644 arch/arm/include/asm/semihosting.h > create mode 100644 arch/arm/lib/semihosting.c create mode 100644 > doc/README.semihosting > > diff --git a/arch/arm/include/asm/semihosting.h > b/arch/arm/include/asm/semihosting.h > new file mode 100644 > index 0000000..74111dc > --- /dev/null > +++ b/arch/arm/include/asm/semihosting.h > @@ -0,0 +1,21 @@ > +/* > + * Copyright 2014 Broadcom Corporation > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +#ifndef __SEMIHOSTING_H__ > +#define __SEMIHOSTING_H__ > + > +/* > + * ARM semihosting functions for loading images to memory. See the > +source > + * code for more information. > + */ > +int smh_load(const char *fname, void *memp, int avail, int verbose); > +int smh_read(int fd, void *memp, int len); int smh_open(const char > +*fname, char *modestr); int smh_close(int fd); int smh_len_fd(int > +fd); int smh_len(const char *fname); > + > +#endif /* __SEMIHOSTING_H__ */ > diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index > 585f1f7..1ef2400 100644 > --- a/arch/arm/lib/Makefile > +++ b/arch/arm/lib/Makefile > @@ -32,6 +32,7 @@ obj-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o else > obj-$(CONFIG_SPL_FRAMEWORK) += spl.o > endif > +obj-$(CONFIG_SEMIHOSTING) += semihosting.o > > obj-y += sections.o > ifdef CONFIG_ARM64 > diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c > new file mode 100644 index 0000000..cb5dc26 > --- /dev/null > +++ b/arch/arm/lib/semihosting.c > @@ -0,0 +1,233 @@ > +/* > + * Copyright 2014 Broadcom Corporation > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +/* > + * Minimal semihosting implementation for reading files into memory. > +If more > + * features like writing files or console output are required they > +can be > + * added later. This code has been tested on arm64/aarch64 fastmodel > only. > + * An untested placeholder exists for armv7 architectures, but since > +they > + * are commonly available in silicon now, fastmodel usage makes less > +sense > + * for them. > + */ > +#include <common.h> > +#include <asm/semihosting.h> > + > +#define SYSOPEN 0x01 > +#define SYSCLOSE 0x02 > +#define SYSREAD 0x06 > +#define SYSFLEN 0x0C > + > +#define MODE_READ 0x0 > +#define MODE_READBIN 0x1 > + > +/* > + * Call the handler > + */ > +static int smh_trap(unsigned int sysnum, void *addr) { > + register int result asm("r0"); > +#if defined(CONFIG_ARM64) > + asm volatile ("hlt #0xf000" : "=r" (result) : "0"(sysnum), > "r"(addr)); > +#else > + /* Note - untested placeholder */ > + asm volatile ("svc #0x123456" : "=r" (result) : "0"(sysnum), > +"r"(addr)); #endif > + return result; > +} > + > +/* > + * Open, load a file into memory, and close it. Check that the > +available space > + * is sufficient to store the entire file. Return the bytes actually > +read from > + * the file as seen by the read function. The verbose flag enables > +some extra > + * printing of successful read status. > + */ > +int smh_load(const char *fname, void *memp, int avail, int verbose) { > + int ret, fd, len; > + > + ret = -1; > + > + debug("%s: fname \'%s\', avail %u, memp %p\n", __func__, fname, > + avail, memp); > + > + /* Open the file */ > + fd = smh_open(fname, "rb"); > + if (fd == -1) > + return ret; > + > + /* Get the file length */ > + ret = smh_len_fd(fd); > + if (ret == -1) { > + smh_close(fd); > + return ret; > + } > + > + /* Check that the file will fit in the supplied buffer */ > + if (ret > avail) { > + printf("%s: ERROR ret %d, avail %u\n", __func__, ret, > + avail); > + smh_close(fd); > + return ret; > + } > + > + len = ret; > + > + /* Read the file into the buffer */ > + ret = smh_read(fd, memp, len); > + if (ret == 0) { > + /* Print successful load information if requested */ > + if (verbose) { > + printf("\n%s\n", fname); > + printf(" 0x%8p dest\n", memp); > + printf(" 0x%08x size\n", len); > + printf(" 0x%08x avail\n", avail); > + } > + } > + > + /* Close the file */ > + smh_close(fd); > + > + return ret; > +} > + > +/* > + * Read 'len' bytes of file into 'memp'. Returns 0 on success, else > +failure */ int smh_read(int fd, void *memp, int len) { > + int ret; > + struct smh_read_s { > + int fd; > + void *memp; > + int len; > + } read; > + > + debug("%s: fd %d, memp %p, len %d\n", __func__, fd, memp, len); > + > + read.fd = fd; > + read.memp = memp; > + read.len = len; > + > + ret = smh_trap(SYSREAD, &read); > + if (ret == 0) { > + return 0; > + } else { > + /* > + * The ARM handler allows for returning partial lengths, > + * but in practice this never happens so rather than create > + * hard to maintain partial read loops and such, just fail > + * with an error message. > + */ > + printf("%s: ERROR ret %d, fd %d, len %u memp %p\n", > + __func__, ret, fd, len, memp); > + } > + return ret; > +} > + > +/* > + * Open a file on the host. Mode is "r" or "rb" currently. Returns a > +file > + * descriptor or -1 on error. > + */ > +int smh_open(const char *fname, char *modestr) { > + int ret, fd, mode; > + struct smh_open_s { > + const char *fname; > + unsigned int mode; > + unsigned int len; > + } open; > + > + debug("%s: file \'%s\', mode \'%s\'\n", __func__, fname, modestr); > + > + ret = -1; > + > + /* Check the file mode */ > + if (!(strcmp(modestr, "r"))) { > + mode = MODE_READ; > + } else if (!(strcmp(modestr, "rb"))) { > + mode = MODE_READBIN; > + } else { > + printf("%s: ERROR mode \'%s\' not supported\n", __func__, > + modestr); > + return ret; > + } > + > + open.fname = fname; > + open.len = strlen(fname); > + open.mode = mode; > + > + /* Open the file on the host */ > + fd = smh_trap(SYSOPEN, &open); > + if (fd == -1) > + printf("%s: ERROR fd %d for file \'%s\'\n", __func__, fd, > + fname); > + > + return fd; > +} > + > +/* > + * Close the file using the file descriptor */ int smh_close(int fd) { > + int ret; > + long fdlong; > + > + debug("%s: fd %d\n", __func__, fd); > + > + fdlong = (long)fd; > + ret = smh_trap(SYSCLOSE, &fdlong); > + if (ret == -1) > + printf("%s: ERROR fd %d\n", __func__, fd); > + > + return ret; > +} > + > +/* > + * Get the file length from the file descriptor */ int > +smh_len_fd(int > +fd) { > + int ret; > + long fdlong; > + > + debug("%s: fd %d\n", __func__, fd); > + > + fdlong = (long)fd; > + ret = smh_trap(SYSFLEN, &fdlong); > + if (ret == -1) > + printf("%s: ERROR ret %d\n", __func__, ret); > + > + return ret; > +} > + > +/* > + * Get the file length from the filename */ int smh_len(const char > +*fname) { > + int ret, fd, len; > + > + debug("%s: file \'%s\'\n", __func__, fname); > + > + /* Open the file */ > + fd = smh_open(fname, "rb"); > + if (fd == -1) > + return fd; > + > + /* Get the file length */ > + len = smh_len_fd(fd); > + > + /* Close the file */ > + ret = smh_close(fd); > + if (ret == -1) > + return ret; > + > + debug("%s: returning len %d\n", __func__, len); > + > + /* Return the file length (or -1 error indication) */ > + return len; > +} > diff --git a/board/armltd/vexpress64/vexpress64.c > b/board/armltd/vexpress64/vexpress64.c > index 2ec3bc9..5897318 100644 > --- a/board/armltd/vexpress64/vexpress64.c > +++ b/board/armltd/vexpress64/vexpress64.c > @@ -11,6 +11,7 @@ > #include <netdev.h> > #include <asm/io.h> > #include <linux/compiler.h> > +#include <asm/semihosting.h> > > DECLARE_GLOBAL_DATA_PTR; > > @@ -31,11 +32,6 @@ int dram_init(void) > return 0; > } > > -int timer_init(void) > -{ > - return 0; > -} > - > /* > * Board specific reset that is system reset. > */ > @@ -43,6 +39,101 @@ void reset_cpu(ulong addr) { } > > +#ifdef CONFIG_BOARD_LATE_INIT > +int board_late_init(void) > +{ > +#ifdef CONFIG_SEMIHOSTING > + /* > + * Please refer to doc/README.semihosting for a more complete > + * description. > + * > + * We require that the board include file defines these env > variables: > + * - kernel_name > + * - kernel_addr_r > + * - initrd_name > + * - initrd_addr_r > + * - fdt_name > + * - fdt_addr_r > + * > + * For the "fdt chosen" startup macro, this code will then define: > + * - initrd_end (based on initrd_addr_r plus actual initrd_size) > + * > + * We will then load the kernel, initrd, and fdt into the specified > + * locations in memory in a similar way that the ATF fastmodel code > + * uses semihosting calls to load other boot stages and u-boot > itself. > + */ > + > + /* Env variable strings */ > + char *kernel_name = getenv("kernel_name"); > + char *kernel_addr_str = getenv("kernel_addr_r"); > + char *initrd_name = getenv("initrd_name"); > + char *initrd_addr_str = getenv("initrd_addr_r"); > + char *fdt_name = getenv("fdt_name"); > + char *fdt_addr_str = getenv("fdt_addr_r"); > + char initrd_end_str[64]; > + > + /* Actual addresses converted from env variables */ > + void *kernel_addr_r; > + void *initrd_addr_r; > + void *fdt_addr_r; > + > + /* Actual initrd base and size */ > + unsigned long initrd_base; > + unsigned long initrd_size; > + > + /* Space available */ > + int avail; > + > + /* Make sure the environment variables needed are set */ > + if (!(kernel_addr_str && initrd_addr_str && fdt_addr_str)) { > + printf("%s: Define {kernel/initrd/fdt}_addr_r\n", __func__); > + return -1; > + } > + if (!(kernel_name && initrd_name && fdt_name)) { > + printf("%s: Define {kernel/initrd/fdt}_name\n", __func__); > + return -1; > + } > + > + /* Get exact initrd_size */ > + initrd_size = smh_len(initrd_name); > + if (initrd_size == -1) { > + printf("%s: Can't get file size for \'%s\'\n", __func__, > + initrd_name); > + return -1; > + } > + > + /* Set initrd_end */ > + initrd_base = simple_strtoul(initrd_addr_str, NULL, 16); > + initrd_addr_r = (void *)initrd_base; > + sprintf(initrd_end_str, "0x%lx", initrd_base + initrd_size - 1); > + setenv("initrd_end", initrd_end_str); > + > + /* Load kernel to memory */ > + fdt_addr_r = (void *)simple_strtoul(fdt_addr_str, NULL, 16); > + kernel_addr_r = (void *)simple_strtoul(kernel_addr_str, NULL, 16); > + > + /* > + * The kernel must be lower in memory than fdt and loading the > + * kernel must not trample the fdt or vice versa. > + */ > + avail = fdt_addr_r - kernel_addr_r; > + if (avail < 0) { > + printf("%s: fdt must be after kernel\n", __func__); > + return -1; > + } > + smh_load(kernel_name, kernel_addr_r, avail, 1); > + > + /* Load fdt to memory */ > + smh_load(fdt_name, fdt_addr_r, 0x20000, 1); > + > + /* Load initrd to memory */ > + smh_load(initrd_name, initrd_addr_r, initrd_size, 1); > + > +#endif /* CONFIG_SEMIHOSTING */ > + return 0; > +} > +#endif /* CONFIG_BOARD_LATE_INIT */ > + > /* > * Board specific ethernet initialization routine. > */ > diff --git a/boards.cfg b/boards.cfg > index 440c312..16b9e79 100644 > --- a/boards.cfg > +++ b/boards.cfg > @@ -44,6 +44,7 @@ > > ###################################################################### > ### > ################################## > > Active aarch64 armv8 - armltd > vexpress64 vexpress_aemv8a > vexpress_aemv8a:ARM64 > David Feng <fenghua(a)phytium.com.cn> > +Active aarch64 armv8 - armltd > vexpress64 vexpress_aemv8a_semi > vexpress_aemv8a:ARM64,SEMIHOSTING,BASE_FVP > Steve Rae <srae(a)broadcom.com> > Active arc arc700 - synopsys - > axs101 - > Alexey Brodkin <abrodkin(a)synopsys.com> > Active arc arc700 - synopsys <none> > arcangel4 - > Alexey Brodkin <abrodkin(a)synopsys.com> > Active arc arc700 - synopsys <none> > arcangel4-be - > Alexey Brodkin <abrodkin(a)synopsys.com> diff --git > a/doc/README.semihosting b/doc/README.semihosting new file mode 100644 > index 0000000..a37feb1 > --- /dev/null > +++ b/doc/README.semihosting > @@ -0,0 +1,35 @@ > +/* > + * Copyright 2014 Broadcom Corporation. > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +Semihosting is ARM's way of having a real or virtual target > +communicate with a host or host debugger for basic operations such as > +file I/O, console I/O, etc. Please see > +http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0471c/ > +Bgb > jjgij.html for more information. > + > +For developing on armv8 virtual fastmodel platforms, semihosting is a > +valuable tool since it allows access to image/configuration files > +before eMMC or other NV media are available. > + > +For reference, the current target vexpress_aemv8a_semi enables > +CONFIG_SEMIHOSTING and CONFIG_BASE_FVP for the "vexpress_aemv8a" board. > + > +We require that the board include file define these env variables: > +- kernel_name e.g. "uImage" > +- kernel_addr_r e.g. "0x80000000" > +- initrd_name e.g. "ramdisk.img" > +- initrd_addr_r e.g. "0x88000000" > +- fdt_name e.g. "devtree.dtb" > +- fdt_addr_r e.g. "0x83000000" > + > +Optionally, "fdt_high" and "initrd_high" can be specified as per > +their rules for allowing or preventing copying of these images. > + > +For the "fdt chosen" startup macro, this code will then define: > +- initrd_end (based on retrieving initrd_addr_r plus actual > +initrd_size) > + > +We will then load the kernel, initrd, and fdt into the specified > +locations in memory in a similar way that the ATF fastmodel code uses > +semihosting calls to load other boot stages and u-boot itself. > diff --git a/include/configs/vexpress_aemv8a.h > b/include/configs/vexpress_aemv8a.h > index dff6adc..1905d13 100644 > --- a/include/configs/vexpress_aemv8a.h > +++ b/include/configs/vexpress_aemv8a.h > @@ -10,9 +10,20 @@ > > #define DEBUG > > +#ifdef CONFIG_BASE_FVP > +#ifndef CONFIG_SEMIHOSTING > +#error CONFIG_BASE_FVP requires CONFIG_SEMIHOSTING #endif #define > +CONFIG_BOARD_LATE_INIT #define CONFIG_ARMV8_SWITCH_TO_EL1 #endif > + > #define CONFIG_REMAKE_ELF > > +#ifndef CONFIG_BASE_FVP > +/* Base FVP not using GICv3 yet */ > #define CONFIG_GICV3 > +#endif > > /*#define CONFIG_ARMV8_SWITCH_TO_EL1*/ > > @@ -30,8 +41,14 @@ > #define CONFIG_BOOTP_VCI_STRING "U-boot.armv8.vexpress_aemv8a" > > /* Link Definitions */ > +#ifdef CONFIG_BASE_FVP > +/* ATF loads u-boot here for BASE_FVP model */ > +#define CONFIG_SYS_TEXT_BASE 0x88000000 > +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + > 0x03f00000) > +#else > #define CONFIG_SYS_TEXT_BASE 0x80000000 > #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + > 0x7fff0) > +#endif > > /* Flat Device Tree Definitions */ > #define CONFIG_OF_LIBFDT > @@ -39,7 +56,11 @@ > #define CONFIG_DEFAULT_DEVICE_TREE vexpress64 > > /* SMP Spin Table Definitions */ > +#ifdef CONFIG_BASE_FVP > +#define CPU_RELEASE_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000) > +#else > #define CPU_RELEASE_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) > +#endif > > /* CS register bases for the original memory map. */ > #define V2M_PA_CS0 0x00000000 > @@ -99,9 +120,15 @@ > #define GICD_BASE (0x2f000000) > #define GICR_BASE (0x2f100000) > #else > + > +#ifdef CONFIG_BASE_FVP > +#define GICD_BASE (0x2f000000) > +#define GICC_BASE (0x2c000000) > +#else > #define GICD_BASE (0x2C001000) > #define GICC_BASE (0x2C002000) > #endif > +#endif > > #define CONFIG_SYS_MEMTEST_START V2M_BASE > #define CONFIG_SYS_MEMTEST_END (V2M_BASE + 0x80000000) > @@ -121,7 +148,6 @@ > #define CONFIG_CONS_INDEX 0 > > #define CONFIG_BAUDRATE 115200 > -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } > #define CONFIG_SYS_SERIAL0 V2M_UART0 > #define CONFIG_SYS_SERIAL1 V2M_UART1 > > @@ -165,17 +191,41 @@ > #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 > > /* Initial environment variables */ > +#ifdef CONFIG_BASE_FVP > +#define CONFIG_EXTRA_ENV_SETTINGS \ > + "kernel_name=uImage\0" \ > + "kernel_addr_r=0x80000000\0" \ > + "initrd_name=ramdisk.img\0" \ > + "initrd_addr_r=0x88000000\0" \ > + "fdt_name=devtree.dtb\0" \ > + "fdt_addr_r=0x83000000\0" \ > + "fdt_high=0xffffffffffffffff\0" \ > + "initrd_high=0xffffffffffffffff\0" > + > +#define CONFIG_BOOTARGS "console=ttyAMA0 earlyprintk=pl011,"\ > + "0x1c090000 debug user_debug=31 "\ > + "loglevel=9" > + > +#define CONFIG_BOOTCOMMAND "fdt addr $fdt_addr_r; fdt resize; " \ > + "fdt chosen $initrd_addr_r $initrd_end; " \ > + "bootm $kernel_addr_r - $fdt_addr_r" > + > +#define CONFIG_BOOTDELAY 1 > + > +#else > + > #define CONFIG_EXTRA_ENV_SETTINGS \ > - "kernel_addr=0x200000\0" \ > - "initrd_addr=0xa00000\0" \ > + "kernel_addr_r=0x200000\0" \ > + "initrd_addr_r=0xa00000\0" \ > "initrd_size=0x2000000\0" \ > - "fdt_addr=0x100000\0" \ > + "fdt_addr_r=0x100000\0" \ > "fdt_high=0xa0000000\0" > > #define CONFIG_BOOTARGS "console=ttyAMA0 > root=/dev/ram0" > -#define CONFIG_BOOTCOMMAND "bootm $kernel_addr " \ > - "$initrd_addr:$initrd_size $fdt_addr" > +#define CONFIG_BOOTCOMMAND "bootm $kernel_addr_r " \ > + "$initrd_addr_r:$initrd_size $fdt_addr_r" > #define CONFIG_BOOTDELAY -1 > +#endif > > /* Do not preserve environment */ > #define CONFIG_ENV_IS_NOWHERE 1 > @@ -187,7 +237,6 @@ > #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ > sizeof(CONFIG_SYS_PROMPT) + 16) > #define CONFIG_SYS_HUSH_PARSER > -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " > #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE > #define CONFIG_SYS_LONGHELP > #define CONFIG_CMDLINE_EDITING 1 > -- > 1.7.9.5

1 0

[U-Boot] Standalone application issue.
by mazen.e 28 May '14

28 May '14

Hi, I am trying to load and execute the hello world standalone app on the arndale exynos 5250. I created an image using the mkimage tool and then used the bootm to load and execute the image. However, the applications does not print anything on the terminal and all what I can see is the following: Image Type: ARM U-Boot Standalone Program (uncompressed) Data Size: 594 Bytes = 594 Bytes Load Address: 70200000 Entry Point: 70200000 Verifying Checksum ... OK XIP Standalone Program ... OK XIP Standalone Program ... OK OK ARNDALE5250 # Could you please help me with that issue. Mnay thanks. -- View this message in context: http://u-boot.10912.n7.nabble.com/Standalone-application-issue-tp180515.html Sent from the U-Boot mailing list archive at Nabble.com.

4 15