September 2015 - U-Boot

[U-Boot] [PATCH v2 00/10] vexpress64 FVP and Juno configuration updates
by Ryan Harkin 01 Oct '15

01 Oct '15

This patch series updates the default configuration of the vexpress64 FVP and Juno platforms to allow it to work on a variety of setups without modification by the user. [PATCH v2 01/10] vexpress64: fix checkpatch warnings [PATCH v2 02/10] vexpress64: Kconfig: tidy up [PATCH v2 03/10] vexpress64: increase max gunzip size [PATCH v2 04/10] vexpress64: fvp dram: add DRAM configuration [PATCH v2 05/10] vexpress64: juno: add androidboot.hardware=juno [PATCH v2 06/10] common/armflash: add command to check if image exists [PATCH v2 07/10] common/armflash: load_image returns success or failure [PATCH v2 08/10] vexpress64: juno: add optional initrd [PATCH v2 09/10] vexpress64: juno: add alternate kernel and device tree [PATCH v2 10/10] vexpress64: juno: use /dev/sda2 arch/arm/Kconfig | 4 ++++ board/armltd/vexpress64/Kconfig | 17 ----------------- board/armltd/vexpress64/MAINTAINERS | 5 +++++ common/cmd_armflash.c | 31 ++++++++++++++++++++++++++----- configs/vexpress_aemv8a_dram_defconfig | 19 +++++++++++++++++++ include/configs/vexpress_aemv8a.h | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 6 files changed, 107 insertions(+), 30 deletions(-) Changes since v1: - dropped the Kconfig changes for CONFIG_SYS_BOOTM_LEN - added CONFIG_SYS_BOOTM_LEN to include/configs/vexpress_aemv8a.h

1 11

[U-Boot] [PATCH v2] arm, at91: small updates for the smartweb board
by Heiko Schocher 01 Oct '15

01 Oct '15

- add CONFIG_BOOT_RETRY_TIME to 30 - fex LED colors - fix button pressed combination - add CONFIG_USB_HOST_ETHER CONFIG_USB_ETHER_ASIX CONFIG_USB_ETHER_MCS7830 Signed-off-by: Heiko Schocher <hs(a)denx.de> Signed-off-by: Matthias Michel <matthias.michel(a)siemens.com> --- $ ./tools/buildman/buildman -b 20150923 at91 WARNING: no status info for 'dra72_evm' WARNING: no maintainers for 'dra72_evm' WARNING: no status info for 'am335x_gp_evm' WARNING: no maintainers for 'am335x_gp_evm' WARNING: no status info for 'hikey' WARNING: no maintainers for 'hikey' Building 5 commits for 61 boards (8 threads, 1 job per thread) Cloning repo for thread 0 Cloning repo for thread 1 Cloning repo for thread 2 Cloning repo for thread 3 Cloning repo for thread 4 Cloning repo for thread 5 Cloning repo for thread 6 Cloning repo for thread 7 305 0 0 /305 axm Changes in v2: - add comments from Andreas Biessmann: remove CONFIG_SYS_PROMPT from board config file as CONFIG_SYS_PROMPT is already defined in smartweb_defconfig. board/siemens/smartweb/smartweb.c | 25 ++++++++++++++----------- include/configs/smartweb.h | 4 ++++ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c index 2d42488..d82f1b7 100644 --- a/board/siemens/smartweb/smartweb.c +++ b/board/siemens/smartweb/smartweb.c @@ -90,7 +90,8 @@ static void smartweb_macb_hw_init(void) pin_to_mask(AT91_PIN_PA17) | pin_to_mask(AT91_PIN_PA25) | pin_to_mask(AT91_PIN_PA26) | - pin_to_mask(AT91_PIN_PA28), + pin_to_mask(AT91_PIN_PA28) | + pin_to_mask(AT91_PIN_PA29), &pioa->pudr); at91_phy_reset(); @@ -101,7 +102,8 @@ static void smartweb_macb_hw_init(void) pin_to_mask(AT91_PIN_PA17) | pin_to_mask(AT91_PIN_PA25) | pin_to_mask(AT91_PIN_PA26) | - pin_to_mask(AT91_PIN_PA28), + pin_to_mask(AT91_PIN_PA28) | + pin_to_mask(AT91_PIN_PA29), &pioa->puer); /* Initialize EMAC=MACB hardware */ @@ -141,13 +143,6 @@ int board_early_init_f(void) int board_init(void) { - /* Adress of boot parameters */ - gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; - - smartweb_nand_hw_init(); -#ifdef CONFIG_MACB - smartweb_macb_hw_init(); -#endif /* power LED red */ at91_set_gpio_output(AT91_PIN_PC6, 0); at91_set_gpio_output(AT91_PIN_PC7, 1); @@ -163,6 +158,13 @@ int board_init(void) at91_udc_probe(&board_udc_data); #endif + /* Adress of boot parameters */ + gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + + smartweb_nand_hw_init(); +#ifdef CONFIG_MACB + smartweb_macb_hw_init(); +#endif return 0; } @@ -197,6 +199,7 @@ void matrix_init(void) void spl_board_init(void) { + /* power LED orange */ at91_set_gpio_output(AT91_PIN_PC6, 1); at91_set_gpio_output(AT91_PIN_PC7, 1); /* alarm LED orange */ @@ -212,8 +215,8 @@ void spl_board_init(void) /* check if both button are pressed */ if (at91_get_gpio_value(AT91_PIN_PA28) == 0 && - at91_get_gpio_value(AT91_PIN_PA29) == 0) { - debug("Recovery button pressed\n"); + at91_get_gpio_value(AT91_PIN_PA29) == 0) { + smartweb_nand_hw_init(); nand_init(); spl_nand_erase_one(0, 0); } diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index d189c3f..e11c016 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -117,6 +117,9 @@ * */ #define CONFIG_MACB +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_ASIX +#define CONFIG_USB_ETHER_MCS7830 #define CONFIG_RMII /* use reduced MII inteface */ #define CONFIG_NET_RETRY_COUNT 20 /* # of DHCP/BOOTP retries */ #define CONFIG_AT91_WANTS_COMMON_PHY @@ -182,6 +185,7 @@ /* General Boot Parameter */ #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTCOMMAND "run flashboot" +#define CONFIG_BOOT_RETRY_TIME 30 #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE \ -- 2.1.0

2 1

[U-Boot] [PATCH] ARM: at91: sama5: add support for CONFIG_ENV_IS_IN_MMC
by Josh Wu 01 Oct '15

01 Oct '15

If defined CONFIG_ENV_IS_IN_MMC, then u-boot environment is saved in mmc's raw sectors. Otherwise, u-boot environment is saved as a file: uboot.env. Signed-off-by: Josh Wu <josh.wu(a)atmel.com> --- include/configs/at91-sama5_common.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 3d6b0ae..a5990ce 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -53,6 +53,13 @@ #define CONFIG_CMD_DHCP #ifdef CONFIG_SYS_USE_MMC + +#ifdef CONFIG_ENV_IS_IN_MMC +/* Use raw reserved sectors to save environment */ +#define CONFIG_ENV_OFFSET 0x2000 +#define CONFIG_ENV_SIZE 0x1000 +#define CONFIG_SYS_MMC_ENV_DEV 0 +#else /* u-boot env in sd/mmc card */ #define CONFIG_ENV_IS_IN_FAT #define CONFIG_FAT_WRITE @@ -60,6 +67,7 @@ #define FAT_ENV_DEVICE_AND_PART "0" #define FAT_ENV_FILE "uboot.env" #define CONFIG_ENV_SIZE 0x4000 +#endif #define CONFIG_BOOTCOMMAND "if test ! -n ${dtb_name}; then " \ "setenv dtb_name at91-${board_name}.dtb; " \ -- 1.9.1

3 2

[U-Boot] [PATCH v3 1/2] bitops: Add support for order_base_2()
by Fabio Estevam 30 Sep '15

30 Sep '15

From: Fabio Estevam <fabio.estevam(a)freescale.com> Add support for the order_base_2() macro (and its dependencies) from the Linux kernel. This is useful for the SPI NOR unlock function. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v2: - None. Changes since v1: - None. arch/arm/include/asm/bitops.h | 56 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h index 9b78043..b9b6d21 100644 --- a/arch/arm/include/asm/bitops.h +++ b/arch/arm/include/asm/bitops.h @@ -108,6 +108,62 @@ static inline int __ilog2(unsigned int x) return generic_fls(x) - 1; } +static inline int fls64(__u64 x) +{ + if (x == 0) + return 0; + return generic_fls(x) + 1; +} + +static inline unsigned fls_long(unsigned long l) +{ + if (sizeof(l) == 4) + return generic_fls(l); + return fls64(l); +} + +/* + * round up to nearest power of two + */ +static inline __attribute__((const)) +unsigned long __roundup_pow_of_two(unsigned long n) +{ + return 1UL << fls_long(n - 1); +} + +/** + * roundup_pow_of_two - round the given value up to nearest power of two + * @n - parameter + * + * round the given value up to the nearest power of two + * - the result is undefined when n == 0 + * - this can be used to initialise global variables from constant data + */ +#define roundup_pow_of_two(n) \ +( \ + __builtin_constant_p(n) ? ( \ + (n == 1) ? 1 : \ + (1UL << (__ilog2((n) - 1) + 1)) \ + ) : \ + __roundup_pow_of_two(n) \ +) + +/** + * order_base_2 - calculate the (rounded up) base 2 order of the argument + * @n: parameter + * + * The first few values calculated by this routine: + * ob2(0) = 0 + * ob2(1) = 0 + * ob2(2) = 1 + * ob2(3) = 2 + * ob2(4) = 2 + * ob2(5) = 3 + * ... and so on. + */ + +#define order_base_2(n) __ilog2(roundup_pow_of_two(n)) + /* * ffz = Find First Zero in word. Undefined if no zero exists, * so code should check against ~0UL first.. -- 1.9.1

2 3

Re: [U-Boot] [PATCH] net: phy: on phy device create do not initialize link to 1
by Joe Hershberger 30 Sep '15

30 Sep '15

On Thu, Sep 24, 2015 at 4:31 PM, Joe Hershberger <joe.hershberger(a)gmail.com> wrote: > On Tue, Sep 15, 2015 at 2:57 AM, Mugunthan V N <mugunthanvnm(a)ti.com> wrote: >> On Friday 04 September 2015 09:01 PM, Joe Hershberger wrote: >>> On Thu, Sep 3, 2015 at 5:20 AM, Mugunthan V N <mugunthanvnm(a)ti.com> wrote: >>>> Currently when phy device is created the link variable is >>>> initialized to 1 which denoted phy link is already up. On a power >>>> reset there is no issue as phy status register link status will >>>> not be set, so phy auto negotiate will be started. But when a cpu >>>> reset is issued (ex: dra72x-evm) phy's link status bit is already >>>> set which leads to assume that link is already setup in >>>> genphy_update_link() initial check which results in ehternet not >>>> working. So do not assume that link is already up and on phy >>>> device create set link to zero. This is verified on dra72x-evm. >>>> >>>> Reported-by: Franklin S Cooper Jr <fcooper(a)ti.com> >>>> Signed-off-by: Mugunthan V N <mugunthanvnm(a)ti.com> >>> >>> Acked-by: Joe Hershberger <joe.hershberger(a)ni.com> >>> >> >> Joe, >> >> A gentle ping on this patch. > > This will go in for next release, since it was outside the merge window. Decided to pull this in for this release. Applied to u-boot-net/master, thanks! -Joe

1 0

[U-Boot] [RESEND PATCH v3 0/5] fix NetConsole for CONFIG_DM_ETH
by Bernhard Nortmann 30 Sep '15

30 Sep '15

(I'm resending this as patch 1/5 is still requiring an ACK/NAK.) With the introduction of driver model and accompanying changes, outdated code in netconsole.c leads to compilation errors when both CONFIG_NETCONSOLE and CONFIG_DM_ETH are set. This is a series of patches to fix these issues and get NetConsole working again with DM_ETH. v2 adds some proper subsystem prefixes on the commit messages, and enables a test case (sunxi board configuration for Banana Pi/Pro) that combines CONFIG_DM_ETH and CONFIG_NETCONSOLE. v3 adds some ACKs by J. Hershberger and a fix to make proper use of dev_get_uclass_priv(). I have tested the resulting code on my Banana Pi (sun7i / Allwinner A20) and had a functional NetConsole again. I also backported eth_is_active() and the netconsole.c changes to v2015.04, to make sure they properly worked in case CONFIG_DM_ETH is absent (v2015.04 predates the introduction of DM_ETH, and I'm lacking other hardware to test CONFIG_NETCONSOLE with). Regards, B. Nortmann Changes in v3: - use dev_get_uclass_priv() Changes in v2: - add "net:" prefix to commit message - add "net:" prefix to commit message Bernhard Nortmann (5): net: expose eth_is_active() function to test network device state net: fix netconsole when CONFIG_DM_ETH is set net: avoid eth_unregister() call when function is unavailable net: support NETCONSOLE option via Kconfig sunxi: add NetConsole by default for Banana Pi/Pro common/bootm.c | 2 ++ configs/Bananapi_defconfig | 3 ++- configs/Bananapro_defconfig | 3 ++- drivers/net/netconsole.c | 14 +++++++++++--- include/net.h | 6 ++++++ net/Kconfig | 6 ++++++ net/eth.c | 18 +++++++++++++++++- 7 files changed, 46 insertions(+), 6 deletions(-) -- 2.4.6

2 11

[U-Boot] [PATCH] tools: kwboot: Add support for UART boot mode patching for Armada XP/38x
by Stefan Roese 30 Sep '15

30 Sep '15

Currently, kwboot only allows dynamic UART boot mode patching for SoCs with header version 0 (Orion, Kirkwood). This patch now enables this "-p" feature also for SoCs with header version 1 (Armada XP / 38x etc). With this its possible now to use the UART boot mode without on images that are generated for other boot devices, like SPI. So no need to change BOOT_FROM to "uart" for UART xmodem booting any more. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Luka Perkov <luka.perkov(a)sartura.hr> Cc: Kevin Smith <kevin.smith(a)elecsyscorp.com> Cc: Dirk Eibach <eibach(a)gdsys.de> --- tools/kwbimage.c | 94 --------------------------------------- tools/kwbimage.h | 133 ++++++++++++++++++++++++++++++++++++++++--------------- tools/kwboot.c | 37 +++++++++++----- 3 files changed, 125 insertions(+), 139 deletions(-) diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 886682d..d33f1b6 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -17,89 +17,6 @@ #include <stdint.h> #include "kwbimage.h" -#define ALIGN_SUP(x, a) (((x) + (a - 1)) & ~(a - 1)) - -/* Structure of the main header, version 0 (Kirkwood, Dove) */ -struct main_hdr_v0 { - uint8_t blockid; /*0 */ - uint8_t nandeccmode; /*1 */ - uint16_t nandpagesize; /*2-3 */ - uint32_t blocksize; /*4-7 */ - uint32_t rsvd1; /*8-11 */ - uint32_t srcaddr; /*12-15 */ - uint32_t destaddr; /*16-19 */ - uint32_t execaddr; /*20-23 */ - uint8_t satapiomode; /*24 */ - uint8_t rsvd3; /*25 */ - uint16_t ddrinitdelay; /*26-27 */ - uint16_t rsvd2; /*28-29 */ - uint8_t ext; /*30 */ - uint8_t checksum; /*31 */ -}; - -struct ext_hdr_v0_reg { - uint32_t raddr; - uint32_t rdata; -}; - -#define EXT_HDR_V0_REG_COUNT ((0x1dc - 0x20) / sizeof(struct ext_hdr_v0_reg)) - -struct ext_hdr_v0 { - uint32_t offset; - uint8_t reserved[0x20 - sizeof(uint32_t)]; - struct ext_hdr_v0_reg rcfg[EXT_HDR_V0_REG_COUNT]; - uint8_t reserved2[7]; - uint8_t checksum; -}; - -/* Structure of the main header, version 1 (Armada 370, Armada XP) */ -struct main_hdr_v1 { - uint8_t blockid; /* 0 */ - uint8_t reserved1; /* 1 */ - uint16_t reserved2; /* 2-3 */ - uint32_t blocksize; /* 4-7 */ - uint8_t version; /* 8 */ - uint8_t headersz_msb; /* 9 */ - uint16_t headersz_lsb; /* A-B */ - uint32_t srcaddr; /* C-F */ - uint32_t destaddr; /* 10-13 */ - uint32_t execaddr; /* 14-17 */ - uint8_t reserved3; /* 18 */ - uint8_t nandblocksize; /* 19 */ - uint8_t nandbadblklocation; /* 1A */ - uint8_t reserved4; /* 1B */ - uint16_t reserved5; /* 1C-1D */ - uint8_t ext; /* 1E */ - uint8_t checksum; /* 1F */ -}; - -/* - * Header for the optional headers, version 1 (Armada 370, Armada XP) - */ -struct opt_hdr_v1 { - uint8_t headertype; - uint8_t headersz_msb; - uint16_t headersz_lsb; - char data[0]; -}; - -/* - * Various values for the opt_hdr_v1->headertype field, describing the - * different types of optional headers. The "secure" header contains - * informations related to secure boot (encryption keys, etc.). The - * "binary" header contains ARM binary code to be executed prior to - * executing the main payload (usually the bootloader). This is - * typically used to execute DDR3 training code. The "register" header - * allows to describe a set of (address, value) tuples that are - * generally used to configure the DRAM controller. - */ -#define OPT_HDR_V1_SECURE_TYPE 0x1 -#define OPT_HDR_V1_BINARY_TYPE 0x2 -#define OPT_HDR_V1_REGISTER_TYPE 0x3 - -#define KWBHEADER_V1_SIZE(hdr) \ - (((hdr)->headersz_msb << 16) | (hdr)->headersz_lsb) - static struct image_cfg_element *image_cfg; static int cfgn; @@ -174,17 +91,6 @@ struct image_cfg_element { #define IMAGE_CFG_ELEMENT_MAX 256 /* - * Byte 8 of the image header contains the version number. In the v0 - * header, byte 8 was reserved, and always set to 0. In the v1 header, - * byte 8 has been changed to a proper field, set to 1. - */ -static unsigned int image_version(void *header) -{ - unsigned char *ptr = header; - return ptr[8]; -} - -/* * Utility functions to manipulate boot mode and ecc modes (convert * them back and forth between description strings and the * corresponding numerical identifiers). diff --git a/tools/kwbimage.h b/tools/kwbimage.h index 8e4a4e2..9d2585c 100644 --- a/tools/kwbimage.h +++ b/tools/kwbimage.h @@ -29,57 +29,109 @@ #define IBR_HDR_UART_ID 0x69 #define IBR_DEF_ATTRIB 0x00 -enum kwbimage_cmd { - CMD_INVALID, - CMD_BOOT_FROM, - CMD_NAND_ECC_MODE, - CMD_NAND_PAGE_SIZE, - CMD_SATA_PIO_MODE, - CMD_DDR_INIT_DELAY, - CMD_DATA -}; +#define ALIGN_SUP(x, a) (((x) + (a - 1)) & ~(a - 1)) -enum kwbimage_cmd_types { - CFG_INVALID = -1, - CFG_COMMAND, - CFG_DATA0, - CFG_DATA1 -}; - -/* typedefs */ -typedef struct bhr_t { - uint8_t blockid; /*0 */ - uint8_t nandeccmode; /*1 */ +/* Structure of the main header, version 0 (Kirkwood, Dove) */ +struct main_hdr_v0 { + uint8_t blockid; /*0 */ + uint8_t nandeccmode; /*1 */ uint16_t nandpagesize; /*2-3 */ uint32_t blocksize; /*4-7 */ uint32_t rsvd1; /*8-11 */ uint32_t srcaddr; /*12-15 */ uint32_t destaddr; /*16-19 */ uint32_t execaddr; /*20-23 */ - uint8_t satapiomode; /*24 */ - uint8_t rsvd3; /*25 */ + uint8_t satapiomode; /*24 */ + uint8_t rsvd3; /*25 */ uint16_t ddrinitdelay; /*26-27 */ uint16_t rsvd2; /*28-29 */ - uint8_t ext; /*30 */ - uint8_t checkSum; /*31 */ -} bhr_t, *pbhr_t; + uint8_t ext; /*30 */ + uint8_t checksum; /*31 */ +}; -struct reg_config { +struct ext_hdr_v0_reg { uint32_t raddr; uint32_t rdata; }; -typedef struct extbhr_t { - uint32_t dramregsoffs; - uint8_t rsrvd1[0x20 - sizeof(uint32_t)]; - struct reg_config rcfg[KWBIMAGE_MAX_CONFIG]; - uint8_t rsrvd2[7]; - uint8_t checkSum; -} extbhr_t, *pextbhr_t; +#define EXT_HDR_V0_REG_COUNT ((0x1dc - 0x20) / sizeof(struct ext_hdr_v0_reg)) + +struct ext_hdr_v0 { + uint32_t offset; + uint8_t reserved[0x20 - sizeof(uint32_t)]; + struct ext_hdr_v0_reg rcfg[EXT_HDR_V0_REG_COUNT]; + uint8_t reserved2[7]; + uint8_t checksum; +}; struct kwb_header { - bhr_t kwb_hdr; - extbhr_t kwb_exthdr; + struct main_hdr_v0 kwb_hdr; + struct ext_hdr_v0 kwb_exthdr; +}; + +/* Structure of the main header, version 1 (Armada 370, Armada XP) */ +struct main_hdr_v1 { + uint8_t blockid; /* 0 */ + uint8_t reserved1; /* 1 */ + uint16_t reserved2; /* 2-3 */ + uint32_t blocksize; /* 4-7 */ + uint8_t version; /* 8 */ + uint8_t headersz_msb; /* 9 */ + uint16_t headersz_lsb; /* A-B */ + uint32_t srcaddr; /* C-F */ + uint32_t destaddr; /* 10-13 */ + uint32_t execaddr; /* 14-17 */ + uint8_t reserved3; /* 18 */ + uint8_t nandblocksize; /* 19 */ + uint8_t nandbadblklocation; /* 1A */ + uint8_t reserved4; /* 1B */ + uint16_t reserved5; /* 1C-1D */ + uint8_t ext; /* 1E */ + uint8_t checksum; /* 1F */ +}; + +/* + * Header for the optional headers, version 1 (Armada 370, Armada XP) + */ +struct opt_hdr_v1 { + uint8_t headertype; + uint8_t headersz_msb; + uint16_t headersz_lsb; + char data[0]; +}; + +/* + * Various values for the opt_hdr_v1->headertype field, describing the + * different types of optional headers. The "secure" header contains + * informations related to secure boot (encryption keys, etc.). The + * "binary" header contains ARM binary code to be executed prior to + * executing the main payload (usually the bootloader). This is + * typically used to execute DDR3 training code. The "register" header + * allows to describe a set of (address, value) tuples that are + * generally used to configure the DRAM controller. + */ +#define OPT_HDR_V1_SECURE_TYPE 0x1 +#define OPT_HDR_V1_BINARY_TYPE 0x2 +#define OPT_HDR_V1_REGISTER_TYPE 0x3 + +#define KWBHEADER_V1_SIZE(hdr) \ + (((hdr)->headersz_msb << 16) | (hdr)->headersz_lsb) + +enum kwbimage_cmd { + CMD_INVALID, + CMD_BOOT_FROM, + CMD_NAND_ECC_MODE, + CMD_NAND_PAGE_SIZE, + CMD_SATA_PIO_MODE, + CMD_DDR_INIT_DELAY, + CMD_DATA +}; + +enum kwbimage_cmd_types { + CFG_INVALID = -1, + CFG_COMMAND, + CFG_DATA0, + CFG_DATA1 }; /* @@ -87,4 +139,15 @@ struct kwb_header { */ void init_kwb_image_type (void); +/* + * Byte 8 of the image header contains the version number. In the v0 + * header, byte 8 was reserved, and always set to 0. In the v1 header, + * byte 8 has been changed to a proper field, set to 1. + */ +static inline unsigned int image_version(void *header) +{ + unsigned char *ptr = header; + return ptr[8]; +} + #endif /* _KWBIMAGE_H_ */ diff --git a/tools/kwboot.c b/tools/kwboot.c index af7a6ee..c5f4492 100644 --- a/tools/kwboot.c +++ b/tools/kwboot.c @@ -614,9 +614,10 @@ static int kwboot_img_patch_hdr(void *img, size_t size) { int rc; - bhr_t *hdr; + struct main_hdr_v1 *hdr; uint8_t csum; - const size_t hdrsz = sizeof(*hdr); + size_t hdrsz = sizeof(*hdr); + int image_ver; rc = -1; hdr = img; @@ -626,8 +627,20 @@ kwboot_img_patch_hdr(void *img, size_t size) goto out; } - csum = kwboot_img_csum8(hdr, hdrsz) - hdr->checkSum; - if (csum != hdr->checkSum) { + image_ver = image_version(img); + if (image_ver < 0) { + fprintf(stderr, "Invalid image header version\n"); + errno = EINVAL; + goto out; + } + + if (image_ver == 0) + hdrsz = sizeof(*hdr); + else + hdrsz = KWBHEADER_V1_SIZE(hdr); + + csum = kwboot_img_csum8(hdr, hdrsz) - hdr->checksum; + if (csum != hdr->checksum) { errno = EINVAL; goto out; } @@ -639,14 +652,18 @@ kwboot_img_patch_hdr(void *img, size_t size) hdr->blockid = IBR_HDR_UART_ID; - hdr->nandeccmode = IBR_HDR_ECC_DISABLED; - hdr->nandpagesize = 0; + if (image_ver == 0) { + struct main_hdr_v0 *hdr_v0 = img; - hdr->srcaddr = hdr->ext - ? sizeof(struct kwb_header) - : sizeof(*hdr); + hdr_v0->nandeccmode = IBR_HDR_ECC_DISABLED; + hdr_v0->nandpagesize = 0; + + hdr_v0->srcaddr = hdr_v0->ext + ? sizeof(struct kwb_header) + : sizeof(*hdr_v0); + } - hdr->checkSum = kwboot_img_csum8(hdr, hdrsz) - csum; + hdr->checksum = kwboot_img_csum8(hdr, hdrsz) - csum; rc = 0; out: -- 2.5.3

2 1

[U-Boot] [PATCH] malloc_simple: fix malloc_ptr calculation
by Philipp Rosenberger 30 Sep '15

30 Sep '15

The gd->malloc_ptr and the gd->malloc_limit are offsets to gd->malloc_base. But the addr variable contains the absolute address. The new_ptr must be: addr + bytes - gd->malloc_base. Signed-off-by: Philipp Rosenberger <ilu(a)linutronix.de> --- common/malloc_simple.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/malloc_simple.c b/common/malloc_simple.c index 134e059..c745863 100644 --- a/common/malloc_simple.c +++ b/common/malloc_simple.c @@ -32,7 +32,7 @@ void *memalign_simple(size_t align, size_t bytes) void *ptr; addr = ALIGN(gd->malloc_base + gd->malloc_ptr, align); - new_ptr = addr + bytes; + new_ptr = addr + bytes - gd->malloc_base; if (new_ptr > gd->malloc_limit) return NULL; ptr = map_sysmem(addr, bytes); -- 2.1.4

4 3

[U-Boot] [PATCH] arm: mvebu: Fix internal register config on A38x
by Stefan Roese 30 Sep '15

30 Sep '15

Currently booting on A38x is broken. As the current code tries to detect the SoC family to disable the MMU for the A38x at runtime. But before the internal registers are switched to the new location (0xf100.0000), this runtime detection does not work. As all macros / defines are already assigned to the new location at 0xf100.0000. But the registers are sill mapped to the default location at 0xd000.0000. This patch now makes sure, no such runtime detection is used before the internal registers are configured to the new location. After this, the remaining cache cleanup is executed. Signed-off-by: Stefan Roese <sr(a)denx.de> Reported-by: Kevin Smith <kevin.smith(a)elecsyscorp.com> Cc: Luka Perkov <luka.perkov(a)sartura.hr> --- arch/arm/mach-mvebu/cpu.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index ea83e21..efd4d04 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -214,32 +214,40 @@ static void setup_usb_phys(void) int arch_cpu_init(void) { -#ifndef CONFIG_SPL_BUILD +#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_ARMADA_38X) + /* + * Only with disabled MMU its possible to switch the base + * register address on Armada 38x. Without this the SDRAM + * located at >= 0x4000.0000 is also not accessible, as its + * still locked to cache. + */ + mmu_disable(); +#endif + + /* Linux expects the internal registers to be at 0xf1000000 */ + writel(SOC_REGS_PHY_BASE, INTREG_BASE_ADDR_REG); + set_cbar(SOC_REGS_PHY_BASE + 0xC000); + +#if !defined(CONFIG_SPL_BUILD) + /* + * From this stage on, the SoC detection is working. As we have + * configured the internal register base to the value used + * in the macros / defines in the U-Boot header (soc.h). + */ if (mvebu_soc_family() == MVEBU_SOC_A38X) { struct pl310_regs *const pl310 = (struct pl310_regs *)CONFIG_SYS_PL310_BASE; /* - * Only with disabled MMU its possible to switch the base - * register address on Armada 38x. Without this the SDRAM - * located at >= 0x4000.0000 is also not accessible, as its - * still locked to cache. - * - * So to fully release / unlock this area from cache, we need - * to first flush all caches, then disable the MMU and - * disable the L2 cache. + * To fully release / unlock this area from cache, we need + * to flush all caches and disable the L2 cache. */ icache_disable(); dcache_disable(); - mmu_disable(); clrbits_le32(&pl310->pl310_ctrl, L2X0_CTRL_EN); } #endif - /* Linux expects the internal registers to be at 0xf1000000 */ - writel(SOC_REGS_PHY_BASE, INTREG_BASE_ADDR_REG); - set_cbar(SOC_REGS_PHY_BASE + 0xC000); - /* * We need to call mvebu_mbus_probe() before calling * update_sdram_window_sizes() as it disables all previously -- 2.5.0

2 2

[U-Boot] [PATCH 00/10] Kconfig and ti omap configs tidy up
by Igor Grinberg 30 Sep '15

30 Sep '15

The patch set is aimed to transferring several config options from the old config.h configuration style to the new Kconfig framework and also move some of the existing (in Kconfig) ones from config.h style to the defconfig style in the ti-omap land. It is based on the 7d31c6a (Merge git://git.denx.de/u-boot-pxa) commit upstream. Igor Grinberg (10): configs: remove remnants of CONFIG_SYS_NAND_QUIET_TEST Kconfig: fix typo in CONFIG_FIT description Kconfig: add CONFIG_BOOTDELAY Kconfig: add CONFIG_CMD_BOOTZ ti: omap3: config: remove 1 from boolean define ti: omap/am: move CONFIG_HUSH_PARSER to defconfig ti: omap/am: move CONFIG_CMD_BOOTZ to defconfig ti: omap/am: move CONFIG_CMD_NAND to defconfig ti: omap/am: move CONFIG_CMD_I2C to defconfig ti: omap/am: move CONFIG_BOOTDELAY to defconfig Kconfig | 2 +- common/Kconfig | 23 +++++++++++++++++++++++ configs/am335x_baltos_defconfig | 6 ++++++ configs/am335x_evm_defconfig | 6 ++++++ configs/am335x_evm_nor_defconfig | 6 ++++++ configs/am335x_evm_norboot_defconfig | 5 +++++ configs/am335x_evm_spiboot_defconfig | 5 +++++ configs/am335x_evm_usbspl_defconfig | 6 ++++++ configs/am335x_gp_evm_defconfig | 4 ++++ configs/am335x_igep0033_defconfig | 6 ++++++ configs/am43xx_evm_defconfig | 6 ++++++ configs/am43xx_evm_ethboot_defconfig | 6 ++++++ configs/am43xx_evm_qspiboot_defconfig | 5 +++++ configs/am43xx_evm_usbhost_boot_defconfig | 6 ++++++ configs/beagle_x15_defconfig | 5 +++++ configs/birdland_bav335a_defconfig | 5 +++++ configs/birdland_bav335b_defconfig | 5 +++++ configs/cairo_defconfig | 6 ++++++ configs/cm_t335_defconfig | 6 ++++++ configs/cm_t35_defconfig | 8 +++++++- configs/cm_t43_defconfig | 8 +++++++- configs/cm_t54_defconfig | 5 +++++ configs/devkit8000_defconfig | 5 +++++ configs/dra72_evm_defconfig | 5 +++++ configs/dra7xx_evm_defconfig | 5 +++++ configs/dra7xx_evm_qspiboot_defconfig | 5 +++++ configs/dra7xx_evm_uart3_defconfig | 5 +++++ configs/draco_defconfig | 1 + configs/duovero_defconfig | 5 +++++ configs/igep0020_defconfig | 5 +++++ configs/igep0020_nand_defconfig | 6 ++++++ configs/igep0030_defconfig | 5 +++++ configs/igep0030_nand_defconfig | 6 ++++++ configs/igep0032_defconfig | 5 +++++ configs/k2e_evm_defconfig | 7 ++++++- configs/k2hk_evm_defconfig | 7 ++++++- configs/k2l_evm_defconfig | 7 ++++++- configs/omap3_beagle_defconfig | 6 ++++++ configs/omap3_overo_defconfig | 6 ++++++ configs/omap3_pandora_defconfig | 6 ++++++ configs/omap3_zoom1_defconfig | 6 ++++++ configs/omap4_panda_defconfig | 5 +++++ configs/omap4_sdp4430_defconfig | 5 +++++ configs/omap5_uevm_defconfig | 5 +++++ configs/pcm051_rev1_defconfig | 5 +++++ configs/pcm051_rev3_defconfig | 5 +++++ configs/pengwyn_defconfig | 6 ++++++ configs/pepper_defconfig | 5 +++++ configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/thuban_defconfig | 1 + include/config_distro_defaults.h | 6 ++++++ include/configs/PMC440.h | 1 - include/configs/alpr.h | 1 - include/configs/cm_t35.h | 6 ------ include/configs/cm_t3517.h | 1 - include/configs/cm_t43.h | 1 - include/configs/cm_t54.h | 3 --- include/configs/devkit8000.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_cairo.h | 4 ---- include/configs/omap3_logic.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/spear-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/ti_armv7_common.h | 8 -------- include/configs/ti_armv7_omap.h | 1 - include/configs/ti_omap3_common.h | 2 +- include/configs/xpedite517x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - 72 files changed, 284 insertions(+), 42 deletions(-) -- 2.4.6

4 25