April 2013 - U-Boot

[U-Boot] [PATCH v2 0/11] Add Regular Expressions Support
by Wolfgang Denk 02 May '13

02 May '13

The following patch series adds the SLRE "Super Light Regular Expression" library and uses this to add regex support for the "env grep" (aka "grepenv") command, and new functions (or operators?) "gsub" and "sub" to the "setexpr" command. The rework to "env grep" also fixed a few bugs (which caused it to dump always _all_ environment variables on some systems), and adds the capability to grep in either the variable name, or the value, or in both (the old version always did the latter). Instead of special functions we now use common code (i. e. hexport_r()) for the variable look-up, which gives us sorted output as a free additional benefit. This allows to do things like - print all MAC addresses: => env grep -e eth.*addr eth1addr=00:10:ec:80:c5:15 ethaddr=00:10:ec:00:c5:15 - print all variables that have at least 2 colons in their value: => env grep -v -e :.*: addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:off panic=1 eth1addr=00:10:ec:80:c5:15 ethaddr=00:10:ec:00:c5:15 ver=U-Boot 2013.04-rc1-00289-g497746b-dirty (Mar 22 2013 - 12:50:25) - Generate broadcast address by substituting the last two numbers of the IP address by "255.255": => print ipaddr ipaddr=192.168.1.104 => setexpr broadcast sub "(.*\\.).*\\..*" "\\1255.255" $ipaddr broadcast=192.168.255.255 - Depending on keyboard configuration (German vs. US keyboard) a bar code scanner may initialize the MAC address as C0:E5:4E:02:06:DC or as C0>E5>4E>02>06>DC. Make sure we always have a correct value: => print ethaddr ethaddr=C0>E5>4E>02>06>DC => setexpr ethaddr gsub > : ethaddr=C0:E5:4E:02:06:DC etc. Regex support can be enabled by defining CONFIG_REGEX in the board config file. Notes: - This patch series has been compile-tested (and found to be clean with ELDK v5.3) on all of the following boards: ARM: m28evk PPC4xx: acadia bamboo bluestone bubinga canyonlands dlvision-10g dlvision ebony gdppc440etx icon intip io io64 iocon katmai kilauea luan makalu neo ocotea redwood sequoia t3corp taihu taishan walnut yosemite yucca - Runtime / functional testing has been done mostly on PPC (Sequoia board). Changes in v2: - fixed trailing whitespace errors - Note 1: The "line over 80 characters" warning will NOT be fixed due to the "never break user-visible strings" rule. - Note 2: The "Alignment should match open parenthesis" check will NOT be fixed due to the "indent by TABs only" rule. - Fix ERROR: "foo * bar" should be "foo *bar" errors - Fix trailing whitespace error - Note: the "Alignment should match open parenthesis" check will not be fixed due to the "indent always byy TABs" rule. - no changes; most of this is imported code and is intentionally left as is - the "Alignment should match open parenthesis" check is left due to the "indent only by TABs" rule - the "line over 80 characters" warning is left due to the "never break user-visible strings" rule - Fix trailing whitespace error - fix "No space is necessary after a cast" checks - fix "space prohibited before semicolon" and "space required after that ';'" errors (but I onsider the result less readable :-( ) - Note: the remaining warnings ("line over 80 characters") and checks ("Alignment should match open parenthesis") are intentionally left as is. - Do the white space cleanup globally, and as separate patch Wolfgang Denk (11): hashtable: preparations to use hexport_r() for "env grep" "env grep" - reimplement command using hexport_r() "env grep" - add options to grep in name, value, or both. Add SLRE - Super Light Regular Expression library "env grep" - add support for regular expression matches setexpr: simplify code, improve help message setexpr: add regex substring matching and substitution m28evk: white space cleanup m28evk: enable "env grep" and regexp support amcc-common.h: minor white space cleanup amcc-common.h: enable support for "env grep", "setexpr", and regex. README | 7 + common/cmd_nvedit.c | 87 +++-- common/cmd_setexpr.c | 296 ++++++++++++++++- include/configs/amcc-common.h | 9 +- include/configs/m28evk.h | 259 +++++++-------- include/search.h | 15 +- include/slre.h | 100 ++++++ lib/Makefile | 1 + lib/hashtable.c | 93 ++++-- lib/slre.c | 724 ++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 1391 insertions(+), 200 deletions(-) create mode 100644 include/slre.h create mode 100644 lib/slre.c -- 1.8.1.4

4 15

[U-Boot] [PATCH] make hang() a weak function
by Andreas Bießmann 02 May '13

02 May '13

This patch also does some minor coding style cleanups. Signed-off-by: Andreas Bießmann <andreas.devel(a)googlemail.com> --- arch/arm/lib/board.c | 3 ++- arch/avr32/lib/board.c | 3 ++- arch/blackfin/lib/board.c | 3 ++- arch/m68k/lib/board.c | 3 ++- arch/microblaze/lib/board.c | 5 +++-- arch/mips/lib/board.c | 3 ++- arch/nds32/lib/board.c | 3 ++- arch/nios2/lib/board.c | 5 +++-- arch/openrisc/lib/board.c | 3 ++- arch/powerpc/lib/board.c | 4 ++-- arch/sandbox/lib/board.c | 3 ++- arch/sh/lib/board.c | 3 ++- arch/sparc/lib/board.c | 3 ++- arch/x86/lib/board.c | 3 ++- common/board_f.c | 3 ++- common/spl/spl.c | 3 ++- drivers/mtd/nand/mxc_nand_spl.c | 3 ++- 17 files changed, 36 insertions(+), 20 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 0521178..4a00e16 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -707,8 +707,9 @@ void board_init_r(gd_t *id, ulong dest_addr) /* NOTREACHED - no way out of command loop except booting */ } -void hang(void) +void __hang(void) { puts("### ERROR ### Please RESET the board ###\n"); for (;;); } +void hang(void) __attribute__((weak, alias("__hang"))); diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c index 57e07df..7e3380a 100644 --- a/arch/avr32/lib/board.c +++ b/arch/avr32/lib/board.c @@ -120,10 +120,11 @@ static int display_banner (void) return 0; } -void hang(void) +void __hang(void) { for (;;) ; } +void hang(void) __attribute__((weak, alias("__hang"))); static int display_dram_config (void) { diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c index 75b6c46..7769962 100644 --- a/arch/blackfin/lib/board.c +++ b/arch/blackfin/lib/board.c @@ -433,7 +433,7 @@ void board_init_r(gd_t * id, ulong dest_addr) main_loop(); } -void hang(void) +void __hang(void) { #ifdef CONFIG_STATUS_LED status_led_set(STATUS_LED_BOOT, STATUS_LED_OFF); @@ -446,3 +446,4 @@ void hang(void) */ asm("emuexcpt;"); } +void hang(void) __attribute__((weak, alias("__hang")); diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c index adaccfe..93aeafb 100644 --- a/arch/m68k/lib/board.c +++ b/arch/m68k/lib/board.c @@ -665,8 +665,9 @@ void board_init_r (gd_t *id, ulong dest_addr) } -void hang(void) +void __hang(void) { puts ("### ERROR ### Please RESET the board ###\n"); for (;;); } +void hang(void) __attribute__((weak, alias("__hang"))); diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index a7c2f76..e661704 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -195,8 +195,9 @@ void board_init_f(ulong not_used) } } -void hang (void) +void __hang(void) { - puts ("### ERROR ### Please RESET the board ###\n"); + puts("### ERROR ### Please RESET the board ###\n"); for (;;) ; } +void hang(void) __attribute__((weak, alias("__hang"))); diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c index f19f198..ad18440 100644 --- a/arch/mips/lib/board.c +++ b/arch/mips/lib/board.c @@ -345,9 +345,10 @@ void board_init_r(gd_t *id, ulong dest_addr) /* NOTREACHED - no way out of command loop except booting */ } -void hang(void) +void __hang(void) { puts("### ERROR ### Please RESET the board ###\n"); for (;;) ; } +void hang(void) __attribute__((weak, alias("__hang"))); diff --git a/arch/nds32/lib/board.c b/arch/nds32/lib/board.c index a7d27fc..2433d8a 100644 --- a/arch/nds32/lib/board.c +++ b/arch/nds32/lib/board.c @@ -405,9 +405,10 @@ void board_init_r(gd_t *id, ulong dest_addr) /* NOTREACHED - no way out of command loop except booting */ } -void hang(void) +void __hang(void) { puts("### ERROR ### Please RESET the board ###\n"); for (;;) ; } +void hang(void) __attribute__((weak, alias("__hang"))); diff --git a/arch/nios2/lib/board.c b/arch/nios2/lib/board.c index 1e495d4..517a3a1 100644 --- a/arch/nios2/lib/board.c +++ b/arch/nios2/lib/board.c @@ -168,9 +168,10 @@ void board_init (void) /***********************************************************************/ -void hang (void) +void __hang(void) { - disable_interrupts (); + disable_interrupts(); puts("### ERROR ### Please reset board ###\n"); for (;;); } +void hang(void) __attribute__((weak, alias("__hang"))); diff --git a/arch/openrisc/lib/board.c b/arch/openrisc/lib/board.c index 85aa189..c5437db 100644 --- a/arch/openrisc/lib/board.c +++ b/arch/openrisc/lib/board.c @@ -158,7 +158,7 @@ void board_init(void) /***********************************************************************/ -void hang(void) +void __hang(void) { disable_interrupts(); puts("### ERROR ### Please reset board ###\n"); @@ -166,3 +166,4 @@ void hang(void) for (;;) ; } +void hang(void) __attribute__((weak, alias("__hang"))); diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index 422b4a3..24bb948 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -1050,14 +1050,14 @@ void board_init_r(gd_t *id, ulong dest_addr) /* NOTREACHED - no way out of command loop except booting */ } -void hang(void) +void __hang(void) { puts("### ERROR ### Please RESET the board ###\n"); bootstage_error(BOOTSTAGE_ID_NEED_RESET); for (;;) ; } - +void hang(void) __attribute__((weak, alias("__hang"))); #if 0 /* We could use plain global data, but the resulting code is bigger */ /* diff --git a/arch/sandbox/lib/board.c b/arch/sandbox/lib/board.c index 3752fab..fe10e6c 100644 --- a/arch/sandbox/lib/board.c +++ b/arch/sandbox/lib/board.c @@ -277,9 +277,10 @@ void board_init_r(gd_t *id, ulong dest_addr) /* NOTREACHED - no way out of command loop except booting */ } -void hang(void) +void __hang(void) { puts("### ERROR ### Please RESET the board ###\n"); for (;;) ; } +void hang(void) __attribute__((weak, alias("__hang"))); diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c index 6e43acf..60be847 100644 --- a/arch/sh/lib/board.c +++ b/arch/sh/lib/board.c @@ -203,9 +203,10 @@ void sh_generic_init(void) /***********************************************************************/ -void hang(void) +void __hang(void) { puts("Board ERROR\n"); for (;;) ; } +void hang(void) __attribute__((weak, alias("__hang"))); diff --git a/arch/sparc/lib/board.c b/arch/sparc/lib/board.c index 79fb4c8..ddd735c 100644 --- a/arch/sparc/lib/board.c +++ b/arch/sparc/lib/board.c @@ -411,7 +411,7 @@ void board_init_f(ulong bootflag) } -void hang(void) +void __hang(void) { puts("### ERROR ### Please RESET the board ###\n"); #ifdef CONFIG_SHOW_BOOT_PROGRESS @@ -419,5 +419,6 @@ void hang(void) #endif for (;;) ; } +void hang(void) __attribute__((weak, alias("__hang"))); /************************************************************************/ diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index f372898..960f323 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -265,9 +265,10 @@ void board_init_r(gd_t *id, ulong dest_addr) /* NOTREACHED - no way out of command loop except booting */ } -void hang(void) +void __hang(void) { puts("### ERROR ### Please RESET the board ###\n"); for (;;) ; } +void hang(void) __attribute__((weak, alias("__hang"))); diff --git a/common/board_f.c b/common/board_f.c index 7698891..d811067 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -1005,8 +1005,9 @@ void board_init_f_r(void) } #endif /* CONFIG_X86 */ -void hang(void) +void __hang(void) { puts("### ERROR ### Please RESET the board ###\n"); for (;;); } +void hang(void) __attribute__((weak, alias("__hang"))); diff --git a/common/spl/spl.c b/common/spl/spl.c index 6715e0d..322b7b8 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -48,12 +48,13 @@ struct spl_image_info spl_image; /* Define board data structure */ static bd_t bdata __attribute__ ((section(".data"))); -inline void hang(void) +inline void __hang(void) { puts("### ERROR ### Please RESET the board ###\n"); for (;;) ; } +void hang(void) __attribute__((weak, alias("__hang"))); /* * Default function to determine if u-boot or the OS should diff --git a/drivers/mtd/nand/mxc_nand_spl.c b/drivers/mtd/nand/mxc_nand_spl.c index 09f23c3..9738045 100644 --- a/drivers/mtd/nand/mxc_nand_spl.c +++ b/drivers/mtd/nand/mxc_nand_spl.c @@ -359,8 +359,9 @@ void nand_boot(void) /* * Called in case of an exception. */ -void hang(void) +void __hang(void) { /* Loop forever */ while (1) ; } +void hang(void) __attribute__((weak, alias("__hang"))); -- 1.7.10.4

9 41

[U-Boot] [PATCH] spl_mmc: cleanup variable types
by Peter Korsgaard 02 May '13

02 May '13

block_read returns unsigned long, so it doesn't make sense to check for < 0. and neither does marking the header structure as const and then casting away the constness to load data into it. Also cleanup some unneeded pointer casting while we're at it. Signed-off-by: Peter Korsgaard <peter.korsgaard(a)barco.com> --- drivers/mmc/spl_mmc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/spl_mmc.c b/drivers/mmc/spl_mmc.c index 753c6a0..7efdcb8 100644 --- a/drivers/mmc/spl_mmc.c +++ b/drivers/mmc/spl_mmc.c @@ -34,8 +34,9 @@ DECLARE_GLOBAL_DATA_PTR; static void mmc_load_image_raw(struct mmc *mmc) { - u32 image_size_sectors, err; - const struct image_header *header; + unsigned long err; + u32 image_size_sectors; + struct image_header *header; header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - sizeof(struct image_header)); @@ -43,9 +44,9 @@ static void mmc_load_image_raw(struct mmc *mmc) /* read image header to find the image size & load address */ err = mmc->block_dev.block_read(0, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR, 1, - (void *)header); + header); - if (err <= 0) + if (err == 0) goto end; spl_parse_image_header(header); @@ -60,8 +61,8 @@ static void mmc_load_image_raw(struct mmc *mmc) image_size_sectors, (void *)spl_image.load_addr); end: - if (err <= 0) { - printf("spl: mmc blk read err - %d\n", err); + if (err == 0) { + printf("spl: mmc blk read err - %lu\n", err); hang(); } } @@ -69,7 +70,7 @@ end: #ifdef CONFIG_SPL_FAT_SUPPORT static void mmc_load_image_fat(struct mmc *mmc) { - s32 err; + int err; struct image_header *header; header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - @@ -83,7 +84,7 @@ static void mmc_load_image_fat(struct mmc *mmc) } err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, - (u8 *)header, sizeof(struct image_header)); + header, sizeof(struct image_header)); if (err <= 0) goto end; -- 1.7.10.4

2 2

[U-Boot] [PATCH 1/2] mx28evk: Guard NAND-related ENV defines with CONFIG_ENV_IS_IN_NAND
by Tom Rini 02 May '13

02 May '13

The redundancy related defines are only correct for NAND, so guard all of that area with CONFIG_ENV_IS_IN_NAND Cc: Fabio Estevam <fabio.estevam(a)freescale.com> Signed-off-by: Tom Rini <trini(a)ti.com> --- include/configs/mx28evk.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index d470b47..3747955 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -138,14 +138,14 @@ #define CONFIG_SYS_NAND_5_ADDR_CYCLE /* Environment is in NAND */ +#ifdef CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_RANGE (512 * 1024) -#ifndef CONFIG_ENV_OFFSET #define CONFIG_ENV_OFFSET 0x300000 -#endif #define CONFIG_ENV_OFFSET_REDUND \ (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) +#endif #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS -- 1.7.9.5

2 3

[U-Boot] Beginner question: need help about LVDS channels for i.MX6Q SabreSD Board
by Igor Ferrara 02 May '13

02 May '13

Hi, I have a Freescale SabreSD board with an i.MX6 quad-core processor. I'm using u-boot-2009.08 (released with Freescale's LTIB) I would like to enable both LVDS channels. In the "lcd_enable" func (file: / board/freescale/mx6q_sabresd/mx6q_sabresd.c) I properly changed some registers following the advice of Freescale but I could not enable the second channel: https://community.freescale.com/docs/DOC-93617 Furthermore, the "ipuv3_fb_init" func is used to initialize a single Display Interface. Can you give me some advice to enable both channels? Thanks for any help, Igor Distinti saluti Best regards Igor Ferrara ________________________________________________ DOT SYSTEM S.r.l. Via Marco Biagi, 34 23871 Lomagna (LC) Tel.: ++39 039-92259 218 Fax.: ++39 039-92259 290 / 229 P.I. (VAT): 02250660137 C.F.: 10222170150 igor.ferrara(a)dotsystem.it <mailto:igor.ferrara@dotsystem.it> http://www.dotsystem.it <http://www.dotsystem.it/> http://www.dotsystem.eu <http://www.dotsystem.eu/> http://www.flex-rail.com <http://www.flex-rail.com/> http://www.railways-dna.com <http://www.railways-dna.com/> http://www.imagesafety-eye.com <http://www.imagesafety-eye.com/> mappa <http://maps.google.it/maps?q=Dot+System+via+marco+biagi+34,+lomagna,+lc &hl=it&ll=45.658478,9.374428&spn=0.010738,0.01442&sll=45.658473,9.374322 &sspn=0.011443,0.019248&t=h&hq=Dot+System&hnear=Via+Marco+Biagi,+Lomagna ,+Lecco,+Lombardia&z=16&iwloc=A> map <http://maps.google.it/maps?q=Dot+System+via+marco+biagi+34,+lomagna,+lc &hl=it&ll=45.658478,9.374428&spn=0.010738,0.01442&sll=45.658473,9.374322 &sspn=0.011443,0.019248&t=h&hq=Dot+System&hnear=Via+Marco+Biagi,+Lomagna ,+Lecco,+Lombardia&z=16&iwloc=A> ________________________________________________ Please confirm the reception of the present message by sending back an answer message Thank You for the cooperation. Note related to the privacy: This message and the possible attached files, contains reserved informations and it is intended to be used only by the addressee(s) under his (their) responsibility. Thank You Following the coming into effect of legislative decree of 8 June 2001, n. 231, which introduced for the first time the concept of "administrative responsibility" for companies. The updating process was carried out in conformity with the content of legislative decree 231/01, the guidelines drawn up by Confindustria as well as specific measures already implemented by the Dot System concerning both internal control and corporate governance. The mailbox to communicate, also in anonymous form, with components of the supervisory is organodivigilanza(a)dotsystem.it <mailto:organodivigilanza@dotsystem.it>

3 4

[U-Boot] [PATCH] powerpc/mpc85xx: add setting of clock-frequency for mpic node
by Wang Dongsheng 02 May '13

02 May '13

Set the device tree property associated with the mpic source frequency. The frequency is used for mpic timer. Signed-off-by: Wang Dongsheng <dongsheng.wang(a)freescale.com> --- arch/powerpc/cpu/mpc85xx/fdt.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 3a268aa..f07d1cf 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -663,6 +663,11 @@ void ft_cpu_setup(void *blob, bd_t *bd) #ifdef CONFIG_FSL_CORENET do_fixup_by_compat_u32(blob, "fsl,qoriq-clockgen-1.0", "clock-frequency", CONFIG_SYS_CLK_FREQ, 1); + do_fixup_by_compat_u32(blob, "fsl,mpic", + "clock-frequency", get_bus_freq(0)/2, 1); +#else + do_fixup_by_compat_u32(blob, "fsl,mpic", + "clock-frequency", get_bus_freq(0), 1); #endif fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); -- 1.7.5.1

2 4

[U-Boot] Pull request - microblaze
by Michal Simek 01 May '13

01 May '13

Hi Tom, please pull these microblaze changes to your tree. 2 of that patches was reviewed by you. Thanks, Michal The following changes since commit d10f68ae47b67acab8b110b5c605dde4197a1820: Prepare v2013.04 (2013-04-19 10:25:43 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git microblaze for you to fetch changes up to 0f21f98dd4d6bff72df4eeaca4163779896cb336: watchdog: Add support for Xilinx Microblaze watchdog (2013-04-30 11:22:43 +0200) ---------------------------------------------------------------- Michal Simek (4): microblaze: Fix reset function microblaze: Enable netconsole microblaze: Disable all cpu features before reset watchdog: Add support for Xilinx Microblaze watchdog arch/microblaze/include/asm/processor.h | 4 +++ arch/microblaze/lib/board.c | 3 ++ board/xilinx/microblaze-generic/microblaze-generic.c | 11 ++++-- board/xilinx/microblaze-generic/xparameters.h | 4 +++ doc/README.watchdog | 3 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/xilinx_tb_wdt.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++ include/configs/microblaze-generic.h | 17 ++++++++- 8 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 drivers/watchdog/xilinx_tb_wdt.c -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform

2 3

[U-Boot] [PATCH v2] spi: mxc_spi: Set master mode for all channels
by Fabio Estevam 01 May '13

01 May '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> The glitch in the SPI clock line, which commit 3cea335c34 (spi: mxc_spi: Fix spi clock glitch durant reset) solved, is back now and itwas re-introduced by commit d36b39bf0d (spi: mxc_spi: Fix ECSPI reset handling). Actually the glitch is happening due to always toggling between slave mode and master mode by configuring the CHANNEL_MODE bits in this reset function. Since the spi driver only supports master mode, set the mode for all channels always to master mode in order to have a stable, "glitch-free" SPI clock line. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - Introduce MXC_CSPICTRL_MODE_MASK definition - Remove additional read of reg_ctrl arch/arm/include/asm/arch-mx5/imx-regs.h | 1 + arch/arm/include/asm/arch-mx6/imx-regs.h | 1 + drivers/spi/mxc_spi.c | 17 +++++++++-------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h index 249d15a..a71cc13 100644 --- a/arch/arm/include/asm/arch-mx5/imx-regs.h +++ b/arch/arm/include/asm/arch-mx5/imx-regs.h @@ -230,6 +230,7 @@ #define MXC_CSPICTRL_EN (1 << 0) #define MXC_CSPICTRL_MODE (1 << 1) #define MXC_CSPICTRL_XCH (1 << 2) +#define MXC_CSPICTRL_MODE_MASK (0xf << 4) #define MXC_CSPICTRL_CHIPSELECT(x) (((x) & 0x3) << 12) #define MXC_CSPICTRL_BITCOUNT(x) (((x) & 0xfff) << 20) #define MXC_CSPICTRL_PREDIV(x) (((x) & 0xF) << 12) diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index eaa7439..d79ab2f 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -346,6 +346,7 @@ struct cspi_regs { #define MXC_CSPICTRL_EN (1 << 0) #define MXC_CSPICTRL_MODE (1 << 1) #define MXC_CSPICTRL_XCH (1 << 2) +#define MXC_CSPICTRL_MODE_MASK (0xf << 4) #define MXC_CSPICTRL_CHIPSELECT(x) (((x) & 0x3) << 12) #define MXC_CSPICTRL_BITCOUNT(x) (((x) & 0xfff) << 20) #define MXC_CSPICTRL_PREDIV(x) (((x) & 0xF) << 12) diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index 4c19e0b..20419e6 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -137,11 +137,15 @@ static s32 spi_cfg_mxc(struct mxc_spi_slave *mxcs, unsigned int cs, return -1; } - /* Reset spi */ - reg_write(&regs->ctrl, 0); - reg_write(&regs->ctrl, MXC_CSPICTRL_EN); - - reg_ctrl = reg_read(&regs->ctrl); + /* + * Reset SPI and set all CSs to master mode, if toggling + * between slave and master mode we might see a glitch + * on the clock line + */ + reg_ctrl = MXC_CSPICTRL_MODE_MASK; + reg_write(&regs->ctrl, reg_ctrl); + reg_ctrl |= MXC_CSPICTRL_EN; + reg_write(&regs->ctrl, reg_ctrl); /* * The following computation is taken directly from Freescale's code. @@ -174,9 +178,6 @@ static s32 spi_cfg_mxc(struct mxc_spi_slave *mxcs, unsigned int cs, reg_ctrl = (reg_ctrl & ~MXC_CSPICTRL_POSTDIV(0x0F)) | MXC_CSPICTRL_POSTDIV(post_div); - /* always set to master mode */ - reg_ctrl |= 1 << (cs + 4); - /* We need to disable SPI before changing registers */ reg_ctrl &= ~MXC_CSPICTRL_EN; -- 1.7.9.5

3 5

[U-Boot] [PATCH v2 0/45] Verified boot implementation based on FIT
by Simon Glass 01 May '13

01 May '13

This series implemented a verified boot system based around FIT images as discussed on the U-Boot mailing list, including on this thread: http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/147830 RSA is used to implement the encryption. Images are signed by mkimage using private keys created by the user. Public keys are written into U-Boot control FDT (CONFIG_OF_CONTROL) for access by bootm etc. at run-time. The control FDT must be stored in a secure place where it cannot be changed after manufacture. Some notes are provided in the documentaion on how this can be achieved. The implementation is fairly efficient and fits nicely into U-Boot. FIT plus RSA adds around 18KB to SPL size which is manageable on modern SoCs. When images are loaded, they are verified with the public keys. Some minor restructuring of the image code is included in this series, since we now support signatures as well as hashes. It is important to have a test framework for this series. For this, sandbox is used, and a script is provided which signs images and gets sandbox to load them using a script, to check that all is well. So some of the patches here related to adding image support for sandbox. A follow-on series is somewhat more agressive in further refactoring the FIT image support to clean it up improve maintainability. Rollback prevention has been added in a separate TPM patch. This ensures that an attacker cannot boot your system with an old image that has been compromised. Support for this is not built into bootm, but instead must be scripted in U-Boot. It is possible that a standard scheme for this could be devised by adding version number tags to the signing procedure. However scripts do provide more flexibility. The TPM patch is here: http://patchwork.ozlabs.org/patch/224163/ This series is available at: http://git.denx.de/u-boot-x86.git in the branch 'vboot'. I have received a number of off-list comments - please do copy the list when replying so that everyone can see your comments. Changes in v2: - Add IMAGE_ENABLE_IGNORE to avoid #ifdef around ignore property handling - Add comment about why mkimage needs to open FIT with O_RDWR - Add new patch to control FIT image printing in SPL - Add new patch to remove #ifdefs in image-fit.c - Add sanity checks on key sizes in RSA (improves security) - Adjust how signing enable works in image.h - Adjust mkimage help to separate out signing options - Allow the control FDT to be set even if there is currently no control FDT - Avoid using malloc in RSA routines (for smaller SPL code size) - Build signing support unconditionally in mkimage - Change hash_block() to use an unsigned int len - Clarify use of output_size parameter to hash_block() - Correct bug in setting control FDT - Fix FDT error handling in fit_image_write_sig() - Fix checkpatch checks about parenthesis alignment - Fix checkpatch warnings about space after cast - Fix checkpatch warnings about split strings - Fix line continuation problem - Fix spelling of multiply in rsa-verify.c - Fix spelling of quite - Fix typo "os defined" -> "is defined" - Move sandbox's command list patch from a later series - Only build RSA support into mkimage if CONFIG_RSA is defined - Put err_msgp strings on a single line - Put params before description in fit_conf_get_prop_node() comment - Rebase on previous patches - Rebase to use updated fdt_valid() function - Rename commit message to say "function" instead of "function" - Require CONFIG_FIT_SIGNATURE in image.h for mkimage to support signing - Revert the whole change including the set_working_fdt_addr() part - Support RSA library version without ERR_remove_thread_state() - Tweak tools/Makefile to make image signing optional - Update README to fix typos - Update README to fix typos and clarify some points - Use U-Boot's -c option instead of hard-coding a boot script - Use gd->arch.ram_buf instead of gd->ram_buf (now that generic board is in) - Use stack instead of calloc() within U-Boot's signature verification code - fdt_valid() sets the FDT pointer to NULL on error, to simplify callers - gd->fdt_blob is now available on all archs (generic board landed) Simon Glass (45): sandbox: config: Enable CONFIG_FIT and CONFIG_CMD_FIT bootstage: Don't build for HOSTCC mkimage: Move ARRAY_SIZE to header file libfdt: Add fdt_next_subnode() to permit easy subnode iteration image: Move timestamp #ifdefs to header file image: Export fit_check_ramdisk() image: Split FIT code into new image-fit.c image: Move HOSTCC image code to tools/ image: Split hash node processing into its own function image: Convert fit_image_hash_set_value() to static, and rename image: Rename fit_image_check_hashes() to fit_image_verify() image: Move hash checking into its own function image: Move error! string to common place image: Export fit_conf_get_prop_node() image: Rename fit_add_hashes() to fit_add_verification_data() image: Rename hash printing to fit_image_print_verification_data() sandbox: Add CONFIG_OF_HOSTFILE to read FDT from host file fdt: Add a parameter to fdt_valid() Add getenv_hex() to return an environment variable as hex fdt: Allow fdt command to check and update control FDT sandbox: fdt: Support fdt command for sandbox env: Fix minor comment typos in cmd_nvedit fdt: Skip checking FDT if the pointer is NULL Revert "fdt- Tell the FDT library where the device tree is" Add stdarg to vsprintf.h Add minor updates to README.fdt-control hash: Add a way to calculate a hash for any algortihm sandbox: config: Enable FIT signatures with RSA sandbox: Provide a way to map from host RAM to U-Boot RAM sandbox: image: Add support for booting images in sandbox image: Add signing infrastructure image: Support signing of images image: Add RSA support for image signing mkimage: Put FIT loading in function and tidy error handling mkimage: Add -k option to specify key directory mkimage: Add -K to write public keys to an FDT blob mkimage: Add -F option to modify an existing .fit file mkimage: Add -c option to specify a comment for key signing mkimage: Add -r option to specify keys that must be verified libfdt: Add fdt_find_regions() image: Add support for signing of FIT configurations image: Remove remaining #ifdefs in image-fit.c image: Add CONFIG_FIT_SPL_PRINT to control FIT image printing in SPL sandbox: Allow -c argument to provide a command list Add verified boot information and test Makefile | 1 + README | 21 + arch/sandbox/cpu/cpu.c | 5 + arch/sandbox/cpu/start.c | 9 +- arch/sandbox/include/asm/io.h | 2 + arch/sandbox/include/asm/state.h | 1 + arch/sandbox/lib/board.c | 38 +- common/Makefile | 2 + common/cmd_bootm.c | 37 +- common/cmd_fdt.c | 87 +- common/cmd_fpga.c | 2 +- common/cmd_nvedit.c | 19 +- common/cmd_source.c | 2 +- common/cmd_ximg.c | 2 +- common/hash.c | 23 + common/image-fit.c | 1533 ++++++++++++++++++++++++++++++++++ common/image-sig.c | 430 ++++++++++ common/image.c | 1686 +------------------------------------- common/main.c | 8 - common/update.c | 2 +- config.mk | 1 + doc/README.fdt-control | 13 +- doc/mkimage.1 | 73 +- doc/uImage.FIT/sign-configs.its | 45 + doc/uImage.FIT/sign-images.its | 42 + doc/uImage.FIT/signature.txt | 382 +++++++++ doc/uImage.FIT/verified-boot.txt | 104 +++ include/bootstage.h | 5 +- include/common.h | 18 + include/configs/sandbox.h | 6 + include/hash.h | 22 + include/image.h | 265 +++++- include/libfdt.h | 81 ++ include/rsa.h | 108 +++ include/vsprintf.h | 2 + lib/fdtdec.c | 3 +- lib/libfdt/fdt.c | 12 + lib/libfdt/fdt_wip.c | 129 +++ lib/rsa/Makefile | 48 ++ lib/rsa/rsa-sign.c | 460 +++++++++++ lib/rsa/rsa-verify.c | 385 +++++++++ test/vboot/.gitignore | 3 + test/vboot/sandbox-kernel.dts | 7 + test/vboot/sandbox-u-boot.dts | 7 + test/vboot/sign-configs.its | 45 + test/vboot/sign-images.its | 42 + test/vboot/vboot_test.sh | 126 +++ tools/Makefile | 23 +- tools/aisimage.c | 1 - tools/fit_image.c | 136 +-- tools/image-host.c | 722 ++++++++++++++++ tools/mkimage.c | 36 +- tools/mkimage.h | 6 + 53 files changed, 5485 insertions(+), 1783 deletions(-) create mode 100644 common/image-fit.c create mode 100644 common/image-sig.c create mode 100644 doc/uImage.FIT/sign-configs.its create mode 100644 doc/uImage.FIT/sign-images.its create mode 100644 doc/uImage.FIT/signature.txt create mode 100644 doc/uImage.FIT/verified-boot.txt create mode 100644 include/rsa.h create mode 100644 lib/rsa/Makefile create mode 100644 lib/rsa/rsa-sign.c create mode 100644 lib/rsa/rsa-verify.c create mode 100644 test/vboot/.gitignore create mode 100644 test/vboot/sandbox-kernel.dts create mode 100644 test/vboot/sandbox-u-boot.dts create mode 100644 test/vboot/sign-configs.its create mode 100644 test/vboot/sign-images.its create mode 100755 test/vboot/vboot_test.sh create mode 100644 tools/image-host.c -- 1.8.1.3

4 55

[U-Boot] [PATCH v4 03/15] sandbox: Switch over to generic board
by Simon Glass 30 Apr '13

30 Apr '13

Add generic board support for sandbox. and remove the old board init code. Select CONFIG_SYS_GENERIC_BOARD for sandbox now that this is supported. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v4: - Squash three generic board commits into one Changes in v3: None Changes in v2: None arch/sandbox/config.mk | 5 +- arch/sandbox/include/asm/io.h | 5 + arch/sandbox/include/asm/u-boot.h | 22 +-- arch/sandbox/lib/Makefile | 1 - arch/sandbox/lib/board.c | 285 -------------------------------------- board/sandbox/sandbox/sandbox.c | 2 +- common/board_f.c | 51 +++++-- common/board_r.c | 8 +- include/asm-generic/sections.h | 2 +- include/configs/sandbox.h | 7 +- lib/fdtdec.c | 2 +- 11 files changed, 66 insertions(+), 324 deletions(-) delete mode 100644 arch/sandbox/lib/board.c diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index 4fd0d4e..988b52c 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -18,5 +18,8 @@ # MA 02111-1307 USA PLATFORM_CPPFLAGS += -DCONFIG_SANDBOX -D__SANDBOX__ -U_FORTIFY_SOURCE -PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM +PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM -DCONFIG_SYS_GENERIC_BOARD PLATFORM_LIBS += -lrt + +# Support generic board on sandbox +__HAVE_ARCH_GENERIC_BOARD := y diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h index 54051a3..0c022f1 100644 --- a/arch/sandbox/include/asm/io.h +++ b/arch/sandbox/include/asm/io.h @@ -20,6 +20,9 @@ * MA 02111-1307 USA */ +#ifndef __SANDBOX_ASM_IO_H +#define __SANDBOX_ASM_IO_H + /* * Given a physical address and a length, return a virtual address * that can be used to access the memory range with the caching @@ -52,3 +55,5 @@ static inline void unmap_sysmem(const void *vaddr) /* Map from a pointer to our RAM buffer */ phys_addr_t map_to_sysmem(void *ptr); + +#endif diff --git a/arch/sandbox/include/asm/u-boot.h b/arch/sandbox/include/asm/u-boot.h index de8120a..5bea1f2 100644 --- a/arch/sandbox/include/asm/u-boot.h +++ b/arch/sandbox/include/asm/u-boot.h @@ -36,26 +36,8 @@ #ifndef _U_BOOT_H_ #define _U_BOOT_H_ 1 -typedef struct bd_info { - unsigned long bi_memstart; /* start of DRAM memory */ - phys_size_t bi_memsize; /* size of DRAM memory in bytes */ - unsigned long bi_flashstart; /* start of FLASH memory */ - unsigned long bi_flashsize; /* size of FLASH memory */ - unsigned long bi_flashoffset; /* reserved area for startup monitor */ - unsigned long bi_sramstart; /* start of SRAM memory */ - unsigned long bi_sramsize; /* size of SRAM memory */ - unsigned long bi_bootflags; /* boot / reboot flag (for LynxOS) */ - unsigned short bi_ethspeed; /* Ethernet speed in Mbps */ - unsigned long bi_intfreq; /* Internal Freq, in MHz */ - unsigned long bi_busfreq; /* Bus Freq, in MHz */ - unsigned int bi_baudrate; /* Console Baudrate */ - unsigned long bi_boot_params; /* where this board expects params */ - struct /* RAM configuration */ - { - ulong start; - ulong size; - } bi_dram[CONFIG_NR_DRAM_BANKS]; -} bd_t; +/* Use the generic board which requires a unified bd_info */ +#include <asm-generic/u-boot.h> /* For image.h:image_check_target_arch() */ #define IH_ARCH_DEFAULT IH_ARCH_SANDBOX diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile index fbe579b..3aad574 100644 --- a/arch/sandbox/lib/Makefile +++ b/arch/sandbox/lib/Makefile @@ -27,7 +27,6 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(ARCH).o -COBJS-y += board.o COBJS-y += interrupts.o SRCS := $(COBJS-y:.o=.c) diff --git a/arch/sandbox/lib/board.c b/arch/sandbox/lib/board.c deleted file mode 100644 index 3752fab..0000000 --- a/arch/sandbox/lib/board.c +++ /dev/null @@ -1,285 +0,0 @@ -/* - * Copyright (c) 2011 The Chromium OS Authors. - * - * (C) Copyright 2002-2006 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * (C) Copyright 2002 - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Marius Groeger <mgroeger(a)sysgo.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -/* - * This file was taken from ARM and changed to remove things we don't - * need. This is most of it, so have tried to avoid being over-zealous! - * For example, we want to have an emulation of the 'DRAM' used by - * U-Boot. - * - * has been talk upstream of unifying the architectures w.r.t board.c, - * so the less change here the better. - */ - -#include <common.h> -#include <command.h> -#include <malloc.h> -#include <stdio_dev.h> -#include <timestamp.h> -#include <version.h> -#include <serial.h> - -#include <os.h> - -DECLARE_GLOBAL_DATA_PTR; - -static gd_t gd_mem; - -/************************************************************************ - * Init Utilities * - ************************************************************************ - * Some of this code should be moved into the core functions, - * or dropped completely, - * but let's get it working (again) first... - */ - -static int display_banner(void) -{ - display_options(); - - return 0; -} - -/** - * Configure and report on the DRAM configuration, which in our case is - * fairly simple. - */ -static int display_dram_config(void) -{ - ulong size = 0; - int i; - - debug("RAM Configuration:\n"); - - for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { -#ifdef DEBUG - printf("Bank #%d: %08lx ", i, gd->bd->bi_dram[i].start); - print_size(gd->bd->bi_dram[i].size, "\n"); -#endif - size += gd->bd->bi_dram[i].size; - } - puts("DRAM: "); - print_size(size, "\n"); - return 0; -} - -/* - * Breathe some life into the board... - * - * Initialize a serial port as console, and carry out some hardware - * tests. - * - * The first part of initialization is running from Flash memory; - * its main purpose is to initialize the RAM so that we - * can relocate the monitor code to RAM. - */ - -/* - * All attempts to come up with a "common" initialization sequence - * that works for all boards and architectures failed: some of the - * requirements are just _too_ different. To get rid of the resulting - * mess of board dependent #ifdef'ed code we now make the whole - * initialization sequence configurable to the user. - * - * The requirements for any new initalization function is simple: it - * receives a pointer to the "global data" structure as it's only - * argument, and returns an integer return code, where 0 means - * "continue" and != 0 means "fatal error, hang the system". - */ -typedef int (init_fnc_t) (void); - -void __dram_init_banksize(void) -{ - gd->bd->bi_dram[0].start = 0; - gd->bd->bi_dram[0].size = gd->ram_size; -} - -void dram_init_banksize(void) - __attribute__((weak, alias("__dram_init_banksize"))); - -init_fnc_t *init_sequence[] = { -#if defined(CONFIG_ARCH_CPU_INIT) - arch_cpu_init, /* basic arch cpu dependent setup */ -#endif -#if defined(CONFIG_BOARD_EARLY_INIT_F) - board_early_init_f, -#endif - timer_init, /* initialize timer */ - env_init, /* initialize environment */ - serial_init, /* serial communications setup */ - console_init_f, /* stage 1 init of console */ - sandbox_early_getopt_check, /* process command line flags (err/help) */ - display_banner, /* say that we are here */ -#if defined(CONFIG_DISPLAY_CPUINFO) - print_cpuinfo, /* display cpu info (and speed) */ -#endif -#if defined(CONFIG_DISPLAY_BOARDINFO) - checkboard, /* display board info */ -#endif - dram_init, /* configure available RAM banks */ - NULL, -}; - -void board_init_f(ulong bootflag) -{ - init_fnc_t **init_fnc_ptr; - uchar *mem; - unsigned long addr_sp, addr, size; - - gd = &gd_mem; - assert(gd); - - memset((void *)gd, 0, sizeof(gd_t)); - -#if defined(CONFIG_OF_EMBED) - /* Get a pointer to the FDT */ - gd->fdt_blob = _binary_dt_dtb_start; -#elif defined(CONFIG_OF_SEPARATE) - /* FDT is at end of image */ - gd->fdt_blob = (void *)(_end_ofs + _TEXT_BASE); -#endif - - for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) { - if ((*init_fnc_ptr)() != 0) - hang(); - } - - size = CONFIG_SYS_SDRAM_SIZE; - mem = os_malloc(CONFIG_SYS_SDRAM_SIZE); - - assert(mem); - gd->arch.ram_buf = mem; - addr = (ulong)(mem + size); - - /* - * reserve memory for malloc() arena - */ - addr_sp = addr - TOTAL_MALLOC_LEN; - debug("Reserving %dk for malloc() at: %08lx\n", - TOTAL_MALLOC_LEN >> 10, addr_sp); - /* - * (permanently) allocate a Board Info struct - * and a permanent copy of the "global" data - */ - addr_sp -= sizeof(bd_t); - gd->bd = (bd_t *) addr_sp; - debug("Reserving %zu Bytes for Board Info at: %08lx\n", - sizeof(bd_t), addr_sp); - - /* Ram ist board specific, so move it to board code ... */ - dram_init_banksize(); - display_dram_config(); /* and display it */ - - /* We don't relocate, so just run the post-relocation code */ - board_init_r(NULL, 0); - - /* NOTREACHED - no way out of command loop except booting */ -} - -/************************************************************************ - * - * This is the next part if the initialization sequence: we are now - * running from RAM and have a "normal" C environment, i. e. global - * data can be written, BSS has been cleared, the stack size in not - * that critical any more, etc. - * - ************************************************************************ - */ - -void board_init_r(gd_t *id, ulong dest_addr) -{ - - if (id) - gd = id; - - gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */ - - serial_initialize(); - -#ifdef CONFIG_POST - post_output_backlog(); -#endif - - /* The Malloc area is at the top of simulated DRAM */ - mem_malloc_init((ulong)gd->arch.ram_buf + gd->ram_size - - TOTAL_MALLOC_LEN, TOTAL_MALLOC_LEN); - - /* initialize environment */ - env_relocate(); - - stdio_init(); /* get the devices list going. */ - - jumptable_init(); - - console_init_r(); /* fully init console as a device */ - -#if defined(CONFIG_DISPLAY_BOARDINFO_LATE) - checkboard(); -#endif - -#if defined(CONFIG_ARCH_MISC_INIT) - /* miscellaneous arch dependent initialisations */ - arch_misc_init(); -#endif -#if defined(CONFIG_MISC_INIT_R) - /* miscellaneous platform dependent initialisations */ - misc_init_r(); -#endif - - /* set up exceptions */ - interrupt_init(); - /* enable exceptions */ - enable_interrupts(); - -#ifdef CONFIG_BOARD_LATE_INIT - board_late_init(); -#endif - -#ifdef CONFIG_POST - post_run(NULL, POST_RAM | post_bootmode_get(0)); -#endif - - sandbox_main_loop_init(); - - /* - * For now, run the main loop. Later we might let this be done - * in the main program. - */ - while (1) - main_loop(); - - /* NOTREACHED - no way out of command loop except booting */ -} - -void hang(void) -{ - puts("### ERROR ### Please RESET the board ###\n"); - for (;;) - ; -} diff --git a/board/sandbox/sandbox/sandbox.c b/board/sandbox/sandbox/sandbox.c index 9883013..8bdba92 100644 --- a/board/sandbox/sandbox/sandbox.c +++ b/board/sandbox/sandbox/sandbox.c @@ -56,6 +56,6 @@ int timer_init(void) int dram_init(void) { - gd->ram_size = CONFIG_DRAM_SIZE; + gd->ram_size = CONFIG_SYS_SDRAM_SIZE; return 0; } diff --git a/common/board_f.c b/common/board_f.c index 00ca811..2045055 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -49,9 +49,11 @@ #include <mpc5xxx.h> #endif +#include <os.h> #include <post.h> #include <spi.h> #include <watchdog.h> +#include <asm/errno.h> #include <asm/io.h> #ifdef CONFIG_MP #include <asm/mp.h> @@ -61,6 +63,9 @@ #include <asm/init_helpers.h> #include <asm/relocate.h> #endif +#ifdef CONFIG_SANDBOX +#include <asm/state.h> +#endif #include <linux/compiler.h> /* @@ -155,6 +160,7 @@ static int init_baud_rate(void) static int display_text_info(void) { +#ifndef CONFIG_SANDBOX ulong bss_start, bss_end; #ifdef CONFIG_SYS_SYM_OFFSETS @@ -166,6 +172,7 @@ static int display_text_info(void) #endif debug("U-Boot code: %08X -> %08lX BSS: -> %08lX\n", CONFIG_SYS_TEXT_BASE, bss_start, bss_end); +#endif #ifdef CONFIG_MODEM_SUPPORT debug("Modem Support enabled\n"); @@ -284,6 +291,8 @@ static int setup_mon_len(void) { #ifdef CONFIG_SYS_SYM_OFFSETS gd->mon_len = _bss_end_ofs; +#elif defined(CONFIG_SANDBOX) + gd->mon_len = (ulong)&_end - (ulong)_init; #else /* TODO: use (ulong)&__bss_end - (ulong)&__text_start; ? */ gd->mon_len = (ulong)&__bss_end - CONFIG_SYS_MONITOR_BASE; @@ -296,6 +305,17 @@ __weak int arch_cpu_init(void) return 0; } +#ifdef CONFIG_SANDBOX +static int setup_ram_buf(void) +{ + gd->arch.ram_buf = os_malloc(CONFIG_SYS_SDRAM_SIZE); + assert(gd->arch.ram_buf); + gd->ram_size = CONFIG_SYS_SDRAM_SIZE; + + return 0; +} +#endif + static int setup_fdt(void) { #ifdef CONFIG_OF_EMBED @@ -470,7 +490,7 @@ static int reserve_malloc(void) static int reserve_board(void) { gd->dest_addr_sp -= sizeof(bd_t); - gd->bd = (bd_t *)gd->dest_addr_sp; + gd->bd = (bd_t *)map_sysmem(gd->dest_addr_sp, sizeof(bd_t)); memset(gd->bd, '\0', sizeof(bd_t)); debug("Reserving %zu Bytes for Board Info at: %08lx\n", sizeof(bd_t), gd->dest_addr_sp); @@ -489,7 +509,7 @@ static int setup_machine(void) static int reserve_global_data(void) { gd->dest_addr_sp -= sizeof(gd_t); - gd->new_gd = (gd_t *)gd->dest_addr_sp; + gd->new_gd = (gd_t *)map_sysmem(gd->dest_addr_sp, sizeof(gd_t)); debug("Reserving %zu Bytes for Global Data at: %08lx\n", sizeof(gd_t), gd->dest_addr_sp); return 0; @@ -506,9 +526,9 @@ static int reserve_fdt(void) gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32); gd->dest_addr_sp -= gd->fdt_size; - gd->new_fdt = (void *)gd->dest_addr_sp; - debug("Reserving %lu Bytes for FDT at: %p\n", - gd->fdt_size, gd->new_fdt); + gd->new_fdt = map_sysmem(gd->dest_addr_sp, gd->fdt_size); + debug("Reserving %lu Bytes for FDT at: %08lx\n", + gd->fdt_size, gd->dest_addr_sp); } return 0; @@ -709,8 +729,9 @@ static int setup_reloc(void) memcpy(gd->new_gd, (char *)gd, sizeof(gd_t)); debug("Relocation Offset is: %08lx\n", gd->reloc_off); - debug("Relocating to %08lx, new gd at %p, sp at %08lx\n", - gd->dest_addr, gd->new_gd, gd->dest_addr_sp); + debug("Relocating to %08lx, new gd at %08lx, sp at %08lx\n", + gd->dest_addr, (ulong)map_to_sysmem(gd->new_gd), + gd->dest_addr_sp); return 0; } @@ -736,6 +757,8 @@ static int jump_to_copy(void) * (CPU cache) */ board_init_f_r_trampoline(gd->start_addr_sp); +#elif defined(CONFIG_SANDBOX) + board_init_r(gd->new_gd, 0); #else relocate_code(gd->dest_addr_sp, gd->new_gd, gd->dest_addr); #endif @@ -758,6 +781,9 @@ static init_fnc_t init_sequence_f[] = { !defined(CONFIG_MPC86xx) && !defined(CONFIG_X86) zero_global_data, #endif +#ifdef CONFIG_SANDBOX + setup_ram_buf, +#endif setup_fdt, setup_mon_len, #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) @@ -816,8 +842,11 @@ static init_fnc_t init_sequence_f[] = { init_baud_rate, /* initialze baudrate settings */ serial_init, /* serial communications setup */ console_init_f, /* stage 1 init of console */ -#if defined(CONFIG_X86) && defined(CONFIG_OF_CONTROL) - prepare_fdt, /* TODO(sjg(a)chromium.org): remove */ +#ifdef CONFIG_SANDBOX + sandbox_early_getopt_check, +#endif +#ifdef CONFIG_OF_CONTROL + fdtdec_prepare_fdt, #endif display_options, /* say that we are here */ display_text_info, /* show debugging info if required */ @@ -1007,5 +1036,9 @@ void board_init_f_r(void) void hang(void) { puts("### ERROR ### Please RESET the board ###\n"); +#ifdef CONFIG_SANDBOX + os_exit(0); +#else for (;;); +#endif } diff --git a/common/board_r.c b/common/board_r.c index 2b17fa6..f801e41 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -136,7 +136,7 @@ static int initr_reloc_global_data(void) { #ifdef CONFIG_SYS_SYM_OFFSETS monitor_flash_len = _end_ofs; -#else +#elif !defined(CONFIG_SANDBOX) monitor_flash_len = (ulong)&__init_end - gd->dest_addr; #endif #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) @@ -264,7 +264,8 @@ static int initr_malloc(void) /* The malloc area is immediately below the monitor copy in DRAM */ malloc_start = gd->dest_addr - TOTAL_MALLOC_LEN; - mem_malloc_init(malloc_start, TOTAL_MALLOC_LEN); + mem_malloc_init((ulong)map_sysmem(malloc_start, TOTAL_MALLOC_LEN), + TOTAL_MALLOC_LEN); return 0; } @@ -691,6 +692,9 @@ static int initr_modem(void) static int run_main_loop(void) { +#ifdef CONFIG_SANDBOX + sandbox_main_loop_init(); +#endif /* main_loop() can return to retry autoboot, if so just run it again */ for (;;) main_loop(); diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h index cca1edb..4b39844 100644 --- a/include/asm-generic/sections.h +++ b/include/asm-generic/sections.h @@ -29,7 +29,7 @@ extern char _data[], _sdata[], _edata[]; extern char __bss_start[], __bss_stop[]; extern char __init_begin[], __init_end[]; extern char _sinittext[], _einittext[]; -extern char _end[]; +extern char _end[], _init[]; extern char __per_cpu_load[], __per_cpu_start[], __per_cpu_end[]; extern char __kprobes_text_start[], __kprobes_text_end[]; extern char __entry_text_start[], __entry_text_end[]; diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 406da43..da7cc9a 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -22,9 +22,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_DRAM_SIZE (128 << 20) - /* Number of bits in a C 'long' on this architecture */ #define CONFIG_SANDBOX_BITS_PER_LONG 64 @@ -76,7 +73,11 @@ #define CONFIG_PHYS_64BIT /* Size of our emulated memory */ +#define CONFIG_SYS_SDRAM_BASE 0 #define CONFIG_SYS_SDRAM_SIZE (128 << 20) +#define CONFIG_SYS_TEXT_BASE 0 +#define CONFIG_SYS_MONITOR_BASE 0 +#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 92fbefe..60369fb 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -357,7 +357,7 @@ int fdtdec_prepare_fdt(void) if (((uintptr_t)gd->fdt_blob & 3) || fdt_check_header(gd->fdt_blob)) { printf("No valid FDT found - please append one to U-Boot " "binary, use u-boot-dtb.bin or define " - "CONFIG_OF_EMBED\n"); + "CONFIG_OF_EMBED. For sandbox, use -d <file.dtb>\n"); return -1; } return 0; -- 1.8.2.1

2 1