November 2014 - U-Boot

[U-Boot] [PATCH] powerpc/c29xpcie: Add secure boot support
by Mingkai Hu 25 Nov '14

25 Nov '14

From: Po Liu <Po.Liu(a)freescale.com> Add NOR and SPI flash secure boot target for C29XPCIE board. Signed-off-by: Po Liu <Po.Liu(a)freescale.com> Signed-off-by: Mingkai.Hu <Mingkai.Hu(a)freescale.com> --- configs/C29XPCIE_NOR_SECBOOT_defconfig | 4 ++++ configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 4 ++++ include/configs/C29XPCIE.h | 2 ++ 3 files changed, 10 insertions(+) create mode 100644 configs/C29XPCIE_NOR_SECBOOT_defconfig create mode 100644 configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig diff --git a/configs/C29XPCIE_NOR_SECBOOT_defconfig b/configs/C29XPCIE_NOR_SECBOOT_defconfig new file mode 100644 index 0000000..86751cf --- /dev/null +++ b/configs/C29XPCIE_NOR_SECBOOT_defconfig @@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SECURE_BOOT" +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_C29XPCIE=y diff --git a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig new file mode 100644 index 0000000..d1a42b2 --- /dev/null +++ b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig @@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SPIFLASH,SECURE_BOOT" +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_C29XPCIE=y diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 5d11278..1d8dce8 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -579,4 +579,6 @@ #define CONFIG_BOOTCOMMAND CONFIG_RAMBOOTCOMMAND +#include <asm/fsl_secure_boot.h> + #endif /* __CONFIG_H */ -- 2.1.0.27.g96db324

3 3

[U-Boot] arm: socfpga: set skew settings for ethernet phy
by dinguyen＠opensource.altera.com 25 Nov '14

25 Nov '14

From: Dinh Nguyen <dinguyen(a)opensource.altera.com> Set the PHY skew settings for the ethernet phy on the SOCFPGA devkit. Signed-off-by: Dinh Nguyen <dinguyen(a)opensource.altera.com> Cc: Vince Bridgers <vbridger(a)opensource.altera.com> Cc: Pavel Machek <pavel(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> Cc: Tom Rini <trini(a)ti.com> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> Cc: Wolfgang Denk <wd(a)denx.de> --- board/altera/socfpga/socfpga_cyclone5.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/board/altera/socfpga/socfpga_cyclone5.c b/board/altera/socfpga/socfpga_cyclone5.c index 0f81d89..a2831c8 100644 --- a/board/altera/socfpga/socfpga_cyclone5.c +++ b/board/altera/socfpga/socfpga_cyclone5.c @@ -8,7 +8,9 @@ #include <asm/arch/reset_manager.h> #include <asm/io.h> +#include <micrel.h> #include <netdev.h> +#include <phy.h> DECLARE_GLOBAL_DATA_PTR; @@ -39,3 +41,13 @@ int board_init(void) return 0; } + +int board_phy_config(struct phy_device *phydev) +{ + ksz9021_phy_extended_write(phydev, MII_KSZ9021_EXT_RGMII_RX_DATA_SKEW, + 0x0); + ksz9021_phy_extended_write(phydev, MII_KSZ9021_EXT_RGMII_TX_DATA_SKEW, + 0x0); + ksz9021_phy_extended_write(phydev, MII_KSZ9021_EXT_RGMII_CLOCK_SKEW, + 0xf0f0); +} -- 2.0.3

5 8

[U-Boot] [PATCH] bootz: fix silent console
by Markus Niebel 25 Nov '14

25 Nov '14

From: Markus Niebel <Markus.Niebel(a)tq-group.com> fixup was lost during split between command code and logic. Signed-off-by: Markus Niebel <Markus.Niebel(a)tq-group.com> --- common/bootm.c | 2 +- common/cmd_bootm.c | 6 ++++++ include/bootm.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/common/bootm.c b/common/bootm.c index 6b3ea8c..94b9503 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -467,7 +467,7 @@ ulong bootm_disable_interrupts(void) #define CONSOLE_ARG "console=" #define CONSOLE_ARG_LEN (sizeof(CONSOLE_ARG) - 1) -static void fixup_silent_linux(void) +void fixup_silent_linux(void) { char *buf; const char *env_val; diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 6723360..d3e410a 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -596,6 +596,12 @@ int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * disable interrupts ourselves */ bootm_disable_interrupts(); +#if defined(CONFIG_SILENT_CONSOLE) && !defined(CONFIG_SILENT_U_BOOT_ONLY) + /* + * same goes for fixup_silent_linux + */ + fixup_silent_linux(); +#endif images.os.os = IH_OS_LINUX; ret = do_bootm_states(cmdtp, flag, argc, argv, diff --git a/include/bootm.h b/include/bootm.h index b3d1a62..8e094b3 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -50,6 +50,8 @@ ulong bootm_disable_interrupts(void); /* This is a special function used by booti/bootz */ int bootm_find_ramdisk_fdt(int flag, int argc, char * const argv[]); +/* This function is used also used by bootz */ +void fixup_silent_linux(void); int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], int states, bootm_headers_t *images, int boot_progress); -- 2.1.1

2 3

Re: [U-Boot] AM335x Ethernet pin mux confusion
by Mugunthan V N 25 Nov '14

25 Nov '14

On Monday 24 November 2014 07:57 PM, Andy Pont wrote: > Hello, > > I am working on porting U-Boot 2014.07 to a custom TI AM3354 based hardware > platform and am confused trying to set the pin mux for the two Ethernet > interfaces that are on the board. > > RGMII1_ pins are connected to an ATHEROS AR8031 PHY (PHY ADDR 04) and the > pins GPMC_A0 .. GPMC_A11 are connected to a Micrel KSZ8041NL (PHY ADDR 01). > The output of the "mii info" command looks OK so the MDIO interface looks to > be OK as it gives: > > PHY 0x00: OUI = 0x0885, Model = 0x11, Rev = 0x03, 10baseT, HDX > PHY 0x01: OUI = 0x0885, Model = 0x11, Rev = 0x03, 10baseT, HDX > PHY 0x04: OUI = 0x1374, Model = 0x07, Rev = 0x04, 1000baseX, FDX > > However, with debug enabled, it is reporting the PHYs incorrectly as it > gives: > > cpsw connected to Micrel KSZ804 > cpsw connected to Micrel KSZ804 > cpsw > > The AR8031 provides a connection to the outside world and the KSZ8041 > connects to an Ethernet switch which then connects on to other devices on > the board to form a private network. The DHCP command just sits in a loop > waiting for PHY auto negotiation to complete but timing out! > > In the SPL code I am setting up the pin mux as follows: > > static struct module_pin_mux rgmii1_pin_mux[] = { > {OFFSET(mii1_txen), MODE(2)}, /* RGMII1_TCTL */ > {OFFSET(mii1_rxdv), MODE(2) | RXACTIVE}, /* RGMII1_RCTL */ > {OFFSET(mii1_txd3), MODE(2)}, /* RGMII1_TD3 */ > {OFFSET(mii1_txd2), MODE(2)}, /* RGMII1_TD2 */ > {OFFSET(mii1_txd1), MODE(2)}, /* RGMII1_TD1 */ > {OFFSET(mii1_txd0), MODE(2)}, /* RGMII1_TD0 */ > {OFFSET(mii1_txclk), MODE(2)}, /* RGMII1_TCLK */ > {OFFSET(mii1_rxclk), MODE(2) | RXACTIVE}, /* RGMII1_RCLK */ > {OFFSET(mii1_rxd3), MODE(2) | RXACTIVE}, /* RGMII1_RD3 */ > {OFFSET(mii1_rxd2), MODE(2) | RXACTIVE}, /* RGMII1_RD2 */ > {OFFSET(mii1_rxd1), MODE(2) | RXACTIVE}, /* RGMII1_RD1 */ > {OFFSET(mii1_rxd0), MODE(2) | RXACTIVE}, /* RGMII1_RD0 */ > {OFFSET(mdio_data), MODE(0) | RXACTIVE | PULLUP_EN}, /* MDIO_DATA > */ > {OFFSET(mdio_clk), MODE(0) | PULLUP_EN}, /* MDIO_CLK */ > {-1}, > }; > > static struct module_pin_mux rmii2_pin_mux[] = { > {OFFSET(gpmc_a0), MODE(2)}, /* RMII2_TXEN */ > {OFFSET(gpmc_a1), MODE(2) | RXACTIVE}, /* RMII2_RXDV */ > {OFFSET(gpmc_a2), MODE(2)}, /* RMII2_TXD3 */ > {OFFSET(gpmc_a3), MODE(2)}, /* RMII2_TXD2 */ > {OFFSET(gpmc_a4), MODE(2)}, /* RMII2_TXD1 */ > {OFFSET(gpmc_a5), MODE(2)}, /* RMII2_TXD0 */ > {OFFSET(gpmc_a6), MODE(2)}, /* RMII2_TXCLK */ > {OFFSET(gpmc_a7), MODE(2) | RXACTIVE}, /* RMII2_RXCLK */ > {OFFSET(gpmc_a8), MODE(2) | RXACTIVE}, /* RMII2_RXD3 */ > {OFFSET(gpmc_a9), MODE(2) | RXACTIVE}, /* RMII2_RXD2 */ > {OFFSET(gpmc_a10), MODE(2) | RXACTIVE}, /* RMII2_RXD1 */ > {OFFSET(gpmc_a11), MODE(2) | RXACTIVE}, /* RMII2_RXD0 */ > {OFFSET(mdio_data), MODE(0) | RXACTIVE | PULLUP_EN}, /* MDIO_DATA */ > {OFFSET(mdio_clk), MODE(0) | PULLUP_EN}, /* MDIO_CLK */ > {-1}, > }; > > Any help would be much appreciated? There is no relation between pinmux and phy attached to the slave. Is your cpsw slave structures are populated with proper phy ids? Regards Mugunthan V N

2 1

[U-Boot] [PATCH] Export redesign
by Martin Dorwig 25 Nov '14

25 Nov '14

this is an atempt to make the export of functions typesafe. I replaced the jumptable void ** by a struct with function pointers. The EXPORT_FUNC macro now has 2 fixed parameters and one variadic parameter The first is the return type of the function, the second the name of the function, and the third is the list of parameters the function takes. The Concept of using enums as indexes for the stubs is keept. the EXPORT_FUNC macros are now expanded four times, 1. to generate the enums 2. to declare the members of the struct 3. to initialize the structmember pointers 4. to call the functions in stubs.c Signed-off-by: Martin Dorwig <dorwig(a)tetronik.com> --- arch/blackfin/cpu/cpu.c | 2 +- board/BuS/eb_cpux9k2/cpux9k2.c | 2 +- common/cmd_load.c | 2 +- common/console.c | 20 +++++----- common/exports.c | 51 ++++++++++++++---------- examples/standalone/stubs.c | 30 +++++++------- include/_exports.h | 84 +++++++++++++++++++++++++-------------- include/asm-generic/global_data.h | 2 +- include/exports.h | 20 +++++++--- 9 files changed, 129 insertions(+), 84 deletions(-) diff --git a/arch/blackfin/cpu/cpu.c b/arch/blackfin/cpu/cpu.c index b7f1188..59c470f 100644 --- a/arch/blackfin/cpu/cpu.c +++ b/arch/blackfin/cpu/cpu.c @@ -121,7 +121,7 @@ static void display_global_data(void) printf(" |-ram_size: %lx\n", gd->ram_size); printf(" |-env_addr: %lx\n", gd->env_addr); printf(" |-env_valid: %lx\n", gd->env_valid); - printf(" |-jt(%p): %p\n", gd->jt, *(gd->jt)); + printf(" |-jt(%p): %p\n", gd->jt, gd->jt->get_version); printf(" \\-bd: %p\n", gd->bd); printf(" |-bi_boot_params: %lx\n", bd->bi_boot_params); printf(" |-bi_memstart: %lx\n", bd->bi_memstart); diff --git a/board/BuS/eb_cpux9k2/cpux9k2.c b/board/BuS/eb_cpux9k2/cpux9k2.c index 5e4778e..76ad7c4 100644 --- a/board/BuS/eb_cpux9k2/cpux9k2.c +++ b/board/BuS/eb_cpux9k2/cpux9k2.c @@ -98,7 +98,7 @@ int misc_init_r(void) puts("Error: invalid MAC at EEPROM\n"); } } - gd->jt[XF_do_reset] = (void *) do_reset; + gd->jt->do_reset = do_reset; #ifdef CONFIG_STATUS_LED status_led_set(STATUS_LED_BOOT, STATUS_LED_BLINKING); diff --git a/common/cmd_load.c b/common/cmd_load.c index f6e522c..d043e6d 100644 --- a/common/cmd_load.c +++ b/common/cmd_load.c @@ -222,7 +222,7 @@ static int read_record(char *buf, ulong len) } /* Check for the console hangup (if any different from serial) */ - if (gd->jt[XF_getc] != getc) { + if (gd->jt->getc != getc) { if (ctrlc()) { return (-1); } diff --git a/common/console.c b/common/console.c index 5a2f411..08cf188 100644 --- a/common/console.c +++ b/common/console.c @@ -124,13 +124,13 @@ static int console_setfile(int file, struct stdio_dev * dev) */ switch (file) { case stdin: - gd->jt[XF_getc] = dev->getc; - gd->jt[XF_tstc] = dev->tstc; + gd->jt->getc = getc; + gd->jt->tstc = tstc; break; case stdout: - gd->jt[XF_putc] = dev->putc; - gd->jt[XF_puts] = dev->puts; - gd->jt[XF_printf] = printf; + gd->jt->putc = putc; + gd->jt->puts = puts; + gd->jt->printf = printf; break; } break; @@ -722,11 +722,11 @@ int console_init_r(void) #endif /* set default handlers at first */ - gd->jt[XF_getc] = serial_getc; - gd->jt[XF_tstc] = serial_tstc; - gd->jt[XF_putc] = serial_putc; - gd->jt[XF_puts] = serial_puts; - gd->jt[XF_printf] = serial_printf; + gd->jt->getc = serial_getc; + gd->jt->tstc = serial_tstc; + gd->jt->putc = serial_putc; + gd->jt->puts = serial_puts; + gd->jt->printf = serial_printf; /* stdin stdout and stderr are in environment */ /* scan for it */ diff --git a/common/exports.c b/common/exports.c index b97ca48..a15d871 100644 --- a/common/exports.c +++ b/common/exports.c @@ -1,11 +1,14 @@ #include <common.h> #include <exports.h> #include <spi.h> +#include <i2c.h> DECLARE_GLOBAL_DATA_PTR; -__attribute__((unused)) static void dummy(void) -{ +#define NOT_EXPORTED(x) \ +void dummy_ ## x(void)\ +{\ + printf("%s not exported\n", #x);\ } unsigned long get_version(void) @@ -13,31 +16,39 @@ unsigned long get_version(void) return XF_VERSION; } -/* Reuse _exports.h with a little trickery to avoid bitrot */ -#define EXPORT_FUNC(sym) gd->jt[XF_##sym] = (void *)sym; +#ifndef CONFIG_CMD_I2C +NOT_EXPORTED(i2c_read) +NOT_EXPORTED(i2c_write) +#endif -#if !defined(CONFIG_X86) && !defined(CONFIG_PPC) -# define install_hdlr dummy -# define free_hdlr dummy -#else /* kludge for non-standard function naming */ -# define install_hdlr irq_install_handler -# define free_hdlr irq_free_handler +void install_hdlr(int irq, interrupt_handler_t handler, void *p) +{ +#if defined(CONFIG_X86) || defined(CONFIG_PPC) + irq_install_handler(irq, handler, p); #endif -#ifndef CONFIG_CMD_I2C -# define i2c_write dummy -# define i2c_read dummy +} + +void free_hdlr(int i) +{ +#if defined(CONFIG_X86) || defined(CONFIG_PPC) + irq_free_handler(i); #endif +} + #ifndef CONFIG_CMD_SPI -# define spi_init dummy -# define spi_setup_slave dummy -# define spi_free_slave dummy -# define spi_claim_bus dummy -# define spi_release_bus dummy -# define spi_xfer dummy +NOT_EXPORTED(spi_init) +NOT_EXPORTED(spi_setup_slave) +NOT_EXPORTED(spi_free_slave) +NOT_EXPORTED(spi_claim_bus) +NOT_EXPORTED(spi_release_bus) +NOT_EXPORTED(spi_xfer) #endif + +#define EXPORT_FUNC(a, x, ...) gd->jt->x = x; + void jumptable_init(void) { - gd->jt = malloc(XF_MAX * sizeof(void *)); + gd->jt = malloc(sizeof(struct jt_funcs)); #include <_exports.h> } diff --git a/examples/standalone/stubs.c b/examples/standalone/stubs.c index 0bf690e..2f14c55 100644 --- a/examples/standalone/stubs.c +++ b/examples/standalone/stubs.c @@ -13,7 +13,7 @@ static void **jt; gd_t *global_data; -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile ( \ " .globl " #x "\n" \ #x ":\n" \ @@ -26,7 +26,7 @@ gd_t *global_data; * r2 holds the pointer to the global_data, r11 is a call-clobbered * register */ -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile ( \ " .globl " #x "\n" \ #x ":\n" \ @@ -41,7 +41,7 @@ gd_t *global_data; * x18 holds the pointer to the global_data, x9 is a call-clobbered * register */ -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile ( \ " .globl " #x "\n" \ #x ":\n" \ @@ -54,7 +54,7 @@ gd_t *global_data; * r9 holds the pointer to the global_data, ip is a call-clobbered * register */ -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile ( \ " .globl " #x "\n" \ #x ":\n" \ @@ -70,7 +70,7 @@ gd_t *global_data; * it; however, GCC/mips generates an additional `nop' after each asm * statement */ -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile ( \ " .globl " #x "\n" \ #x ":\n" \ @@ -82,7 +82,7 @@ gd_t *global_data; /* * gp holds the pointer to the global_data, r8 is call-clobbered */ -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile ( \ " .globl " #x "\n" \ #x ":\n" \ @@ -98,7 +98,7 @@ gd_t *global_data; * d7 holds the pointer to the global_data, a0 is a call-clobbered * register */ -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile ( \ " .globl " #x "\n" \ #x ":\n" \ @@ -113,7 +113,7 @@ gd_t *global_data; /* * r31 holds the pointer to the global_data. r5 is a call-clobbered. */ -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile ( \ " .globl " #x "\n" \ #x ":\n" \ @@ -126,7 +126,7 @@ gd_t *global_data; * P3 holds the pointer to the global_data, P0 is a call-clobbered * register */ -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile ( \ " .globl _" #x "\n_" \ #x ":\n" \ @@ -138,7 +138,7 @@ gd_t *global_data; /* * r6 holds the pointer to the global_data. r8 is call clobbered. */ -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile( \ " .globl\t" #x "\n" \ #x ":\n" \ @@ -151,7 +151,7 @@ gd_t *global_data; /* * r13 holds the pointer to the global_data. r1 is a call clobbered. */ -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile ( \ " .align 2\n" \ " .globl " #x "\n" \ @@ -169,7 +169,7 @@ gd_t *global_data; /* * g7 holds the pointer to the global_data. g1 is call clobbered. */ -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile( \ " .globl\t" #x "\n" \ #x ":\n" \ @@ -185,7 +185,7 @@ gd_t *global_data; * r16 holds the pointer to the global_data. gp is call clobbered. * not support reduced register (16 GPR). */ -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile ( \ " .globl " #x "\n" \ #x ":\n" \ @@ -198,7 +198,7 @@ gd_t *global_data; * r10 holds the pointer to the global_data, r13 is a call-clobbered * register */ -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile ( \ " .globl " #x "\n" \ #x ":\n" \ @@ -211,7 +211,7 @@ gd_t *global_data; /* * r25 holds the pointer to the global_data. r10 is call clobbered. */ -#define EXPORT_FUNC(x) \ +#define EXPORT_FUNC(a, x, ...) \ asm volatile( \ " .align 4\n" \ " .globl " #x "\n" \ diff --git a/include/_exports.h b/include/_exports.h index 349a3c5..7f18645 100644 --- a/include/_exports.h +++ b/include/_exports.h @@ -1,32 +1,58 @@ /* - * You do not need to use #ifdef around functions that may not exist + * You need to use #ifdef around functions that may not exist * in the final configuration (such as i2c). + * define a dummy function here, and implement it in exports.c + * As an example see the CONFIG_CMD_I2C sections below */ -EXPORT_FUNC(get_version) -EXPORT_FUNC(getc) -EXPORT_FUNC(tstc) -EXPORT_FUNC(putc) -EXPORT_FUNC(puts) -EXPORT_FUNC(printf) -EXPORT_FUNC(install_hdlr) -EXPORT_FUNC(free_hdlr) -EXPORT_FUNC(malloc) -EXPORT_FUNC(free) -EXPORT_FUNC(udelay) -EXPORT_FUNC(get_timer) -EXPORT_FUNC(vprintf) -EXPORT_FUNC(do_reset) -EXPORT_FUNC(getenv) -EXPORT_FUNC(setenv) -EXPORT_FUNC(simple_strtoul) -EXPORT_FUNC(strict_strtoul) -EXPORT_FUNC(simple_strtol) -EXPORT_FUNC(strcmp) -EXPORT_FUNC(i2c_write) -EXPORT_FUNC(i2c_read) -EXPORT_FUNC(spi_init) -EXPORT_FUNC(spi_setup_slave) -EXPORT_FUNC(spi_free_slave) -EXPORT_FUNC(spi_claim_bus) -EXPORT_FUNC(spi_release_bus) -EXPORT_FUNC(spi_xfer) + EXPORT_FUNC(unsigned long, get_version, void) + EXPORT_FUNC(int, getc, void) + EXPORT_FUNC(int, tstc, void) + EXPORT_FUNC(void, putc, const char) + EXPORT_FUNC(void, puts, const char *) + EXPORT_FUNC(int, printf, const char*, ...) + EXPORT_FUNC(void, install_hdlr, + int, interrupt_handler_t, void*) + EXPORT_FUNC(void, free_hdlr, int) + EXPORT_FUNC(void *, malloc, size_t) + EXPORT_FUNC(void, free, void *) + EXPORT_FUNC(void, udelay, unsigned long) + EXPORT_FUNC(unsigned long, get_timer, unsigned long) + EXPORT_FUNC(int, vprintf, const char *, va_list) + EXPORT_FUNC(int, do_reset, cmd_tbl_t *, int , int , char * const []) + EXPORT_FUNC(char *, getenv, const char*) + EXPORT_FUNC(int, setenv, const char *, const char *) + EXPORT_FUNC(unsigned long, simple_strtoul, + const char *, char **, unsigned int) + EXPORT_FUNC(int, strict_strtoul, + const char *, unsigned int , unsigned long *) + EXPORT_FUNC(long, simple_strtol, const char *, char **, unsigned int) + EXPORT_FUNC(int, strcmp, const char *cs, const char *ct) +#ifdef CONFIG_CMD_I2C + EXPORT_FUNC(int, i2c_write, uchar, uint, int , uchar * , int) + EXPORT_FUNC(int, i2c_read, uchar, uint, int , uchar * , int) +#else + EXPORT_FUNC(void, dummy_i2c_write, void) + EXPORT_FUNC(void, dummy_i2c_read, void) +#endif + +#ifdef CONFIG_CMD_SPI + EXPORT_FUNC(void, spi_init, void) + EXPORT_FUNC(struct spi_slave *, spi_setup_slave, + unsigned int, unsigned int, unsigned int, unsigned int) + EXPORT_FUNC(void, spi_free_slave, struct spi_slave *) + EXPORT_FUNC(int, spi_claim_bus, struct spi_slave *) + EXPORT_FUNC(void, spi_release_bus, struct spi_slave *) + EXPORT_FUNC(int, spi_xfer, struct spi_slave *, + unsigned int, const void *, void *, unsigned long) +#else + EXPORT_FUNC(void, dummy_spi_init, void) + EXPORT_FUNC(void, dummy_spi_setup_slave, void) + EXPORT_FUNC(void, dummy_spi_free_slave, void) + EXPORT_FUNC(void, dummy_spi_claim_bus, void) + EXPORT_FUNC(void, dummy_spi_release_bus, void) + EXPORT_FUNC(void, dummy_spi_xfer, void) +#endif + EXPORT_FUNC(unsigned long, ustrtoul, + const char *, char **, unsigned int) + EXPORT_FUNC(unsigned long long, ustrtoull, + const char *, char **, unsigned int) diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 74df210..f8b1919 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -73,7 +73,7 @@ typedef struct global_data { const void *fdt_blob; /* Our device tree, NULL if none */ void *new_fdt; /* Relocated FDT */ unsigned long fdt_size; /* Space reserved for relocated FDT */ - void **jt; /* jump table */ + struct jt_funcs *jt; /* jump table */ char env_buf[32]; /* buffer for getenv() before reloc. */ #ifdef CONFIG_TRACE void *trace_buff; /* The trace buffer */ diff --git a/include/exports.h b/include/exports.h index 41d5085..5211aed 100644 --- a/include/exports.h +++ b/include/exports.h @@ -10,19 +10,19 @@ int tstc(void); void putc(const char); void puts(const char*); int printf(const char* fmt, ...); -void install_hdlr(int, void (*interrupt_handler_t)(void *), void*); +void install_hdlr(int, interrupt_handler_t, void*); void free_hdlr(int); void *malloc(size_t); void free(void*); void __udelay(unsigned long); unsigned long get_timer(unsigned long); int vprintf(const char *, va_list); -unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base); +unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base); int strict_strtoul(const char *cp, unsigned int base, unsigned long *res); char *getenv (const char *name); int setenv (const char *varname, const char *varvalue); -long simple_strtol(const char *cp,char **endp,unsigned int base); -int strcmp(const char * cs,const char * ct); +long simple_strtol(const char *cp, char **endp, unsigned int base); +int strcmp(const char *cs, const char *ct); unsigned long ustrtoul(const char *cp, char **endp, unsigned int base); unsigned long long ustrtoull(const char *cp, char **endp, unsigned int base); #if defined(CONFIG_CMD_I2C) @@ -35,13 +35,21 @@ void app_startup(char * const *); #endif /* ifndef __ASSEMBLY__ */ enum { -#define EXPORT_FUNC(x) XF_ ## x , +#define EXPORT_FUNC(res, func, ...) XF_##func, #include <_exports.h> -#undef EXPORT_FUNC +#undef EXPORT_FUNC XF_MAX }; + +struct jt_funcs { +#define EXPORT_FUNC(res, func, ...) res(*func)(__VA_ARGS__); +#include <_exports.h> +#undef EXPORT_FUNC +}; + + #define XF_VERSION 6 #if defined(CONFIG_X86) -- 1.8.1.4

2 1

[U-Boot] [PATCH 0/7] MIPS: convert all boards to generic-board
by Daniel Schwierzeck 25 Nov '14

25 Nov '14

Daniel Schwierzeck (7): common/board_f: add setup of initial stack frame for MIPS common/board_f: fix gcc warning on MIPS64 MIPS: dbau1x00: switch to generic board MIPS: pb1x00: switch to generic board MIPS: qemu_mips: switch to generic board MIPS: vct: switch to generic board MIPS: remove board.c arch/mips/lib/Makefile | 3 - arch/mips/lib/board.c | 320 ------------------------------------------ common/board_f.c | 18 ++- include/configs/dbau1x00.h | 3 + include/configs/pb1x00.h | 3 + include/configs/qemu-mips.h | 3 + include/configs/qemu-mips64.h | 3 + include/configs/vct.h | 3 + 8 files changed, 28 insertions(+), 328 deletions(-) delete mode 100644 arch/mips/lib/board.c -- 2.1.3

4 20

[U-Boot] [PATCH] sunxi: video: Add extra modes and allow selecting the mode via hdmi_mode env
by Hans de Goede 25 Nov '14

25 Nov '14

Add the following extra modes: 1280x720@50 1920x1080@60 1920x1200@60 And allow selecting them by setting (and then saving and rebooting) a hdmi_mode env variable to the name of the mode. Also make the reserved fb mem slightly larger to allow 1920x1200 to work. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- drivers/video/sunxi_display.c | 91 +++++++++++++++++++++++++++++++++++++----- include/configs/sunxi-common.h | 2 +- 2 files changed, 81 insertions(+), 12 deletions(-) diff --git a/drivers/video/sunxi_display.c b/drivers/video/sunxi_display.c index 3060bee..349e36c 100644 --- a/drivers/video/sunxi_display.c +++ b/drivers/video/sunxi_display.c @@ -355,15 +355,14 @@ retry: } } -void *video_hw_init(void) +static void video_get_mode(char *modestr, struct fb_videomode *mode) { - static GraphicDevice *graphic_device = &sunxi_display.graphic_device; - /* - * Vesa standard 1024x768@60 - * 65.0 1024 1032 1176 1344 768 771 777 806 -hsync -vsync - */ - struct fb_videomode mode = { - .name = "1024x768", + const struct fb_videomode modes[] = { { + /* + * Vesa standard 1024x768@60 + * 65.0 1024 1032 1176 1344 768 771 777 806 -hsync -vsync + */ + .name = "1024x768@60", .refresh = 60, .xres = 1024, .yres = 768, @@ -377,7 +376,76 @@ void *video_hw_init(void) .sync = 0, .vmode = 0, .flag = 0, - }; + } , { + .name = "1280x720@50", + .refresh = 50, + .xres = 1280, + .yres = 720, + .pixclock = 74250, + .left_margin = 440, + .right_margin = 220, + .upper_margin = 20, + .lower_margin = 5, + .hsync_len = 40, + .vsync_len = 5, + .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, + .vmode = FB_VMODE_NONINTERLACED, + .flag = 0, + } , { + .name = "1920x1080@60", + .refresh = 60, + .xres = 1920, + .yres = 1080, + .pixclock = 148500, + .left_margin = 88, + .right_margin = 148, + .upper_margin = 36, + .lower_margin = 4, + .hsync_len = 44, + .vsync_len = 5, + .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, + .vmode = FB_VMODE_NONINTERLACED, + .flag = 0, + } , { + .name = "1920x1200@60", + .refresh = 60, + .xres = 1920, + .yres = 1200, + .pixclock = 154000, + .left_margin = 48, + .right_margin = 80, + .upper_margin = 26, + .lower_margin = 3, + .hsync_len = 32, + .vsync_len = 6, + .sync = FB_SYNC_HOR_HIGH_ACT, + .vmode = FB_VMODE_NONINTERLACED, + .flag = 0, + } }; + int i; + + if (!modestr) { + *mode = modes[0]; + return; + } + + for (i = 0; i < ARRAY_SIZE(modes); i++) { + if (strcmp(modes[i].name, modestr) == 0) + break; + } + if (i >= ARRAY_SIZE(modes)) { + eprintf("Mode %s not available, falling back to %s\n", + modestr, modes[0].name); + i = 0; + } + + *mode = modes[i]; +} + +void *video_hw_init(void) +{ + static GraphicDevice *graphic_device = &sunxi_display.graphic_device; + struct fb_videomode mode; int ret; memset(&sunxi_display, 0, sizeof(struct sunxi_display)); @@ -390,10 +458,11 @@ void *video_hw_init(void) if (!ret) return NULL; - printf("HDMI connected.\n"); sunxi_display.enabled = true; + video_get_mode(getenv("hdmi_mode"), &mode); + + printf("HDMI connected, setting up a %s console.\n", mode.name); - printf("Setting up a %s console.\n", mode.name); sunxi_engines_init(); sunxi_mode_set(&mode, gd->fb_base - CONFIG_SYS_SDRAM_BASE); diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 7b958f8..a6cdffb 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -202,7 +202,7 @@ * The amount of RAM that is reserved for the FB. This will not show up as * RAM to the kernel, but will be reclaimed by a KMS driver in future. */ -#define CONFIG_SUNXI_FB_SIZE (8 << 20) +#define CONFIG_SUNXI_FB_SIZE (9 << 20) /* Do we want to initialize a simple FB? */ #define CONFIG_VIDEO_DT_SIMPLEFB -- 2.1.0

2 2

[U-Boot] [PATCH] powerpc/c29xpcie: Add secure boot support
by Mingkai Hu 25 Nov '14

25 Nov '14

From: Po Liu <Po.Liu(a)freescale.com> Add NOR and SPI flash secure boot target for C29XPCIE board. Signed-off-by: Po Liu <Po.Liu(a)freescale.com> Signed-off-by: Mingkai.Hu <Mingkai.Hu(a)freescale.com> --- boards.cfg | 2 ++ include/configs/C29XPCIE.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/boards.cfg b/boards.cfg index 853446c..b2328ec 100644 --- a/boards.cfg +++ b/boards.cfg @@ -769,6 +769,8 @@ Active powerpc mpc85xx - freescale bsc9132qds Active powerpc mpc85xx - freescale c29xpcie C29XPCIE C29XPCIE:C29XPCIE,36BIT Po Liu <po.liu(a)freescale.com> Active powerpc mpc85xx - freescale c29xpcie C29XPCIE_NAND C29XPCIE:C29XPCIE,36BIT,NAND Po Liu <po.liu(a)freescale.com> Active powerpc mpc85xx - freescale c29xpcie C29XPCIE_SPIFLASH C29XPCIE:C29XPCIE,36BIT,SPIFLASH Po Liu <po.liu(a)freescale.com> +Active powerpc mpc85xx - freescale c29xpcie C29XPCIE_SECBOOT C29XPCIE:C29XPCIE,36BIT,SECURE_BOOT Po Liu <po.liu(a)freescale.com> +Active powerpc mpc85xx - freescale c29xpcie C29XPCIE_SPIFLASH_SECBOOT C29XPCIE:C29XPCIE,36BIT,SPIFLASH,SECURE_BOOT Po Liu <po.liu(a)freescale.com> Active powerpc mpc85xx - freescale corenet_ds P3041DS - - Active powerpc mpc85xx - freescale corenet_ds P3041DS_NAND P3041DS:RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000 - Active powerpc mpc85xx - freescale corenet_ds P3041DS_SDCARD P3041DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000 - diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index be91704..dea6e87 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -576,4 +576,6 @@ #define CONFIG_BOOTCOMMAND CONFIG_RAMBOOTCOMMAND +#include <asm/fsl_secure_boot.h> + #endif /* __CONFIG_H */ -- 2.1.0.27.g96db324

2 1

[U-Boot] [PATCH] sun6i: Add gmac support for sun6i boards
by Hans de Goede 25 Nov '14

25 Nov '14

Hookup the gmac found on the sun6i / A31 SoCs. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 8 +++++ arch/arm/include/asm/arch-sunxi/cpu.h | 4 +++ arch/arm/include/asm/arch-sunxi/gpio.h | 1 + board/sunxi/gmac.c | 45 +++++++++++++++++++++++++++ configs/CSQ_CS908_defconfig | 2 +- configs/Mele_M9_defconfig | 2 +- 6 files changed, 60 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h index 7e810bb..4bdc0de 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h @@ -204,6 +204,7 @@ struct sunxi_ccm_reg { #define AHB_GATE_OFFSET_USB_EHCI1 27 #define AHB_GATE_OFFSET_USB_EHCI0 26 #define AHB_GATE_OFFSET_MCTL 14 +#define AHB_GATE_OFFSET_GMAC 17 #define AHB_GATE_OFFSET_MMC3 11 #define AHB_GATE_OFFSET_MMC2 10 #define AHB_GATE_OFFSET_MMC1 9 @@ -230,6 +231,12 @@ struct sunxi_ccm_reg { #define CCM_USB_CTRL_PHY1_CLK (0x1 << 9) #define CCM_USB_CTRL_PHY2_CLK (0x1 << 10) +#define CCM_GMAC_CTRL_TX_CLK_SRC_MII 0x0 +#define CCM_GMAC_CTRL_TX_CLK_SRC_EXT_RGMII 0x1 +#define CCM_GMAC_CTRL_TX_CLK_SRC_INT_RGMII 0x2 +#define CCM_GMAC_CTRL_GPIT_MII (0x0 << 2) +#define CCM_GMAC_CTRL_GPIT_RGMII (0x1 << 2) + #define MDFS_CLK_DEFAULT 0x81000002 /* PLL6 / 3 */ #define CCM_DRAMCLK_CFG_DIV0(x) ((x - 1) << 8) @@ -265,6 +272,7 @@ struct sunxi_ccm_reg { #define MBUS_CLK_DEFAULT 0x81000001 /* PLL6 / 2 */ /* ahb_reset0 offsets */ +#define AHB_RESET_OFFSET_GMAC 17 #define AHB_RESET_OFFSET_MCTL 14 #define AHB_RESET_OFFSET_MMC3 11 #define AHB_RESET_OFFSET_MMC2 10 diff --git a/arch/arm/include/asm/arch-sunxi/cpu.h b/arch/arm/include/asm/arch-sunxi/cpu.h index 90e06c0..8aeed2f 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu.h +++ b/arch/arm/include/asm/arch-sunxi/cpu.h @@ -99,9 +99,13 @@ #define SUNXI_SCR_BASE 0x01c2c400 +#ifndef CONFIG_MACH_SUN6I #define SUNXI_GPS_BASE 0x01c30000 #define SUNXI_MALI400_BASE 0x01c40000 #define SUNXI_GMAC_BASE 0x01c50000 +#else +#define SUNXI_GMAC_BASE 0x01c30000 +#endif #define SUNXI_DRAM_COM_BASE 0x01c62000 #define SUNXI_DRAM_CTL0_BASE 0x01c63000 diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h index c734cf0..366c0dc 100644 --- a/arch/arm/include/asm/arch-sunxi/gpio.h +++ b/arch/arm/include/asm/arch-sunxi/gpio.h @@ -134,6 +134,7 @@ enum sunxi_gpio_number { #define SUNXI_GPIO_OUTPUT 1 #define SUNXI_GPA0_EMAC 2 +#define SUN6I_GPA0_GMAC 2 #define SUN7I_GPA0_GMAC 5 #define SUNXI_GPB0_TWI0 2 diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c index 051aca0..571bc9e 100644 --- a/board/sunxi/gmac.c +++ b/board/sunxi/gmac.c @@ -13,7 +13,12 @@ int sunxi_gmac_initialize(bd_t *bis) (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; /* Set up clock gating */ +#ifndef CONFIG_MACH_SUN6I setbits_le32(&ccm->ahb_gate1, 0x1 << AHB_GATE_OFFSET_GMAC); +#else + setbits_le32(&ccm->ahb_reset0_cfg, 0x1 << AHB_RESET_OFFSET_GMAC); + setbits_le32(&ccm->ahb_gate0, 0x1 << AHB_GATE_OFFSET_GMAC); +#endif /* Set MII clock */ #ifdef CONFIG_RGMII @@ -33,6 +38,7 @@ int sunxi_gmac_initialize(bd_t *bis) setbits_le32(&ccm->gmac_clk_cfg, 0x3 << 10); #endif +#ifndef CONFIG_MACH_SUN6I /* Configure pin mux settings for GMAC */ for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(16); pin++) { #ifdef CONFIG_RGMII @@ -43,9 +49,48 @@ int sunxi_gmac_initialize(bd_t *bis) sunxi_gpio_set_cfgpin(pin, SUN7I_GPA0_GMAC); sunxi_gpio_set_drv(pin, 3); } +#elif defined CONFIG_RGMII + /* Configure sun6i RGMII mode pin mux settings */ + for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(3); pin++) { + sunxi_gpio_set_cfgpin(pin, SUN6I_GPA0_GMAC); + sunxi_gpio_set_drv(pin, 3); + } + for (pin = SUNXI_GPA(9); pin <= SUNXI_GPA(14); pin++) { + sunxi_gpio_set_cfgpin(pin, SUN6I_GPA0_GMAC); + sunxi_gpio_set_drv(pin, 3); + } + for (pin = SUNXI_GPA(19); pin <= SUNXI_GPA(20); pin++) { + sunxi_gpio_set_cfgpin(pin, SUN6I_GPA0_GMAC); + sunxi_gpio_set_drv(pin, 3); + } + for (pin = SUNXI_GPA(25); pin <= SUNXI_GPA(27); pin++) { + sunxi_gpio_set_cfgpin(pin, SUN6I_GPA0_GMAC); + sunxi_gpio_set_drv(pin, 3); + } +#elif defined CONFIG_GMII + /* Configure sun6i GMII mode pin mux settings */ + for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(27); pin++) { + sunxi_gpio_set_cfgpin(pin, SUN6I_GPA0_GMAC); + sunxi_gpio_set_drv(pin, 2); + } +#else + /* Configure sun6i MII mode pin mux settings */ + for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(3); pin++) + sunxi_gpio_set_cfgpin(pin, SUN6I_GPA0_GMAC); + for (pin = SUNXI_GPA(8); pin <= SUNXI_GPA(9); pin++) + sunxi_gpio_set_cfgpin(pin, SUN6I_GPA0_GMAC); + for (pin = SUNXI_GPA(11); pin <= SUNXI_GPA(14); pin++) + sunxi_gpio_set_cfgpin(pin, SUN6I_GPA0_GMAC); + for (pin = SUNXI_GPA(19); pin <= SUNXI_GPA(24); pin++) + sunxi_gpio_set_cfgpin(pin, SUN6I_GPA0_GMAC); + for (pin = SUNXI_GPA(26); pin <= SUNXI_GPA(27); pin++) + sunxi_gpio_set_cfgpin(pin, SUN6I_GPA0_GMAC); +#endif #ifdef CONFIG_RGMII return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_RGMII); +#elif defined CONFIG_GMII + return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_GMII); #else return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_MII); #endif diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig index cdc0404..679fe47 100644 --- a/configs/CSQ_CS908_defconfig +++ b/configs/CSQ_CS908_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI" +CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" CONFIG_FDTFILE="sun6i-a31s-cs908.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig index 7e50888..6f466ca 100644 --- a/configs/Mele_M9_defconfig +++ b/configs/Mele_M9_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI" +CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" CONFIG_FDTFILE="sun6i-a31-m9.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -- 2.1.0

2 1

[U-Boot] [PATCH 0/5] sunxi: display: Add DDC & EDID support
by Hans de Goede 25 Nov '14

25 Nov '14

Hi Ian and Anatolij, The first 2 patches here are minor fixes to the existing sunxi display code, a quick review would be appreciated, so that I can queue them up for the next pull-req. The other 3 patches are for next, so you can take your time reviewing them. Anatolij, patches 3 and 4 add 2 new edid utility functions, so a review from you would be appreciated. Patch 5 uses them, so your input there would be appreciated too. Regards, Hans

3 11