diff options
32 files changed, 30 insertions, 41 deletions
@@ -23,7 +23,7 @@ VERSION = 2012 PATCHLEVEL = 04 -SUBLEVEL = +SUBLEVEL = 01 EXTRAVERSION = ifneq "$(SUBLEVEL)" "" U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) @@ -814,7 +814,7 @@ The following options need to be configured: CONFIG_CMD_TIME * run command and report execution time CONFIG_CMD_USB * USB support CONFIG_CMD_CDP * Cisco Discover Protocol support - CONFIG_CMD_FSL * Microblaze FSL support + CONFIG_CMD_MFSL * Microblaze FSL support EXAMPLE: If you want all functions except of network diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/arch/arm/cpu/armv7/omap-common/spl_nand.c index 1295e88752..8cf55c9a1c 100644 --- a/arch/arm/cpu/armv7/omap-common/spl_nand.c +++ b/arch/arm/cpu/armv7/omap-common/spl_nand.c @@ -54,7 +54,7 @@ void spl_nand_load_image(void) * load parameter image * load to temp position since nand_spl_load_image reads * a whole block which is typically larger than - * CONFIG_CMD_SAVEBP_WRITE_SIZE therefore may overwrite + * CONFIG_CMD_SPL_WRITE_SIZE therefore may overwrite * following sections like BSS */ nand_spl_load_image(CONFIG_CMD_SPL_NAND_OFS, diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 1c1bee6aeb..599547d2c8 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -256,6 +256,7 @@ static int create_fdt(bootm_headers_t *images) fdt_chosen(*of_flat_tree, 1); fixup_memory_node(*of_flat_tree); + fdt_fixup_ethernet(*of_flat_tree); fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1); return 0; @@ -317,6 +318,7 @@ static void boot_jump_linux(bootm_headers_t *images) unsigned long machid = gd->bd->bi_arch_number; char *s; void (*kernel_entry)(int zero, int arch, uint params); + unsigned long r2; kernel_entry = (void (*)(int, int, uint))images->ep; @@ -330,7 +332,15 @@ static void boot_jump_linux(bootm_headers_t *images) "...\n", (ulong) kernel_entry); bootstage_mark(BOOTSTAGE_ID_RUN_OS); announce_and_cleanup(); - kernel_entry(0, machid, gd->bd->bi_boot_params); + +#ifdef CONFIG_OF_LIBFDT + if (images->ft_len) + r2 = (unsigned long)images->ft_addr; + else +#endif + r2 = gd->bd->bi_boot_params; + + kernel_entry(0, machid, r2); } /* Main Entry point for arm bootm implementation diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index 6c3e8eb379..7603bf9008 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -90,13 +90,7 @@ int sandbox_main_loop_init(void) /* Execute command if required */ if (state->cmd) { - /* TODO: redo this when cmd tidy-up series lands */ -#ifdef CONFIG_SYS_HUSH_PARSER run_command(state->cmd, 0); -#else - parse_string_outer(state->cmd, FLAG_PARSE_SEMICOLON | - FLAG_EXIT_FROM_LOOP); -#endif os_exit(state->exit_type); } diff --git a/common/cmd_nand.c b/common/cmd_nand.c index bae630dfb6..0fd3a6c414 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -191,7 +191,7 @@ static int arg_off_size(int argc, char *const argv[], int *idx, loff_t *off, loff_t *size) { int ret; - loff_t maxsize; + loff_t maxsize = 0; if (argc == 0) { *off = 0; diff --git a/common/main.c b/common/main.c index db181d319b..3b9e39a980 100644 --- a/common/main.c +++ b/common/main.c @@ -1338,7 +1338,8 @@ static int builtin_run_command(const char *cmd, int flag) continue; } - rc = cmd_process(flag, argc, argv, &repeatable); + if (cmd_process(flag, argc, argv, &repeatable)) + rc = -1; /* Did the user stop this? */ if (had_ctrlc ()) diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 2c6b8295fb..55f4f7a30b 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -15,7 +15,6 @@ #define CONFIG_CMD_AMBAPP /* AMBA Plug & Play Bus print utility */ #define CONFIG_CMD_ASKENV /* ask for env variable */ -#define CONFIG_CMD_AT91_SPIMUX /* AT91 MMC/SPI Mux Support */ #define CONFIG_CMD_BDI /* bdinfo */ #define CONFIG_CMD_BEDBUG /* Include BedBug Debugger */ #define CONFIG_CMD_BMP /* BMP support */ diff --git a/include/configs/HWW1U1A.h b/include/configs/HWW1U1A.h index 01597b965b..f08d78b91c 100644 --- a/include/configs/HWW1U1A.h +++ b/include/configs/HWW1U1A.h @@ -422,7 +422,7 @@ const char *hww1u1a_get_ps1(void); #define CONFIG_MD5 #define CONFIG_SHA1 #define CONFIG_CMD_MD5SUM -#define CONFIG_CMD_SHA1 +#define CONFIG_CMD_SHA1SUM #define CONFIG_CMD_ASKENV #define CONFIG_CMD_SETEXPR diff --git a/include/configs/MBX.h b/include/configs/MBX.h index cb5b023b58..79780bd1a3 100644 --- a/include/configs/MBX.h +++ b/include/configs/MBX.h @@ -87,7 +87,6 @@ * Command line configuration. */ #define CONFIG_CMD_NET -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_CMD_PCMCIA #define CONFIG_CMD_IDE diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 619a8002a7..84ba78f9e9 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -38,7 +38,6 @@ #define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_NFS -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SAVEENV diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 6a02188108..159857d32f 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -107,7 +107,6 @@ #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_IMI #undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_AUTOSCRIPT #undef CONFIG_CMD_LOADS #define CONFIG_CMD_PING diff --git a/include/configs/debris.h b/include/configs/debris.h index 60c7c4058f..303630d7d7 100644 --- a/include/configs/debris.h +++ b/include/configs/debris.h @@ -148,7 +148,7 @@ #define CONFIG_CMD_ELF #define CONFIG_CMD_I2C #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_KGBD +#define CONFIG_CMD_KGDB #define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_SAVES diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index d5173349c4..1f660235f0 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -119,7 +119,6 @@ #ifdef CONFIG_VIDEO #define CONFIG_CMD_BMP #endif -#define CONFIG_CMD_DFL #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h index f19360d501..221d3e055d 100644 --- a/include/configs/ep8260.h +++ b/include/configs/ep8260.h @@ -325,7 +325,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SNTP -#undef CONFIG_CMD_DCR #undef CONFIG_CMD_XIMG /* Where do the internal registers live? */ diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 462cc7e16c..efff3098a5 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -70,7 +70,6 @@ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #include <config_cmd_default.h> #define CONFIG_CMD_I2C -#define CONFIG_CMD_AUTOSCRIPT #undef CONFIG_CMD_FPGA #define CONFIG_CMD_USB #define CONFIG_CMD_EXT2 diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h index f72ee02abf..d644fea22f 100644 --- a/include/configs/jadecpu.h +++ b/include/configs/jadecpu.h @@ -130,7 +130,6 @@ #undef CONFIG_CMD_XIMG #define CONFIG_CMD_BMP -#define CONFIG_CMD_CAN #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_FAT diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index 621dbb8fa6..d505a41de4 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -447,7 +447,6 @@ */ #define CONFIG_CMD_CHIP_CONFIG #define CONFIG_CMD_DATE -#define CONFIG_CMD_LOG #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI #define CONFIG_CMD_SNTP diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index a6f2864c65..68215fda9d 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -435,7 +435,6 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ -#define CONFIG_CMD_LOG #define CONFIG_CMD_MII #define CONFIG_CMD_NET #define CONFIG_CMD_NFS diff --git a/include/configs/makalu.h b/include/configs/makalu.h index fcc789d714..6c1b136659 100644 --- a/include/configs/makalu.h +++ b/include/configs/makalu.h @@ -252,7 +252,6 @@ */ #define CONFIG_CMD_DATE #define CONFIG_CMD_DTT -#define CONFIG_CMD_LOG #define CONFIG_CMD_PCI #define CONFIG_CMD_SNTP diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index 7cf641fd13..f1104902be 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -35,7 +35,6 @@ #define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PING -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_CMD_MEMORY #define CONFIG_CMD_SAVEENV diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index 03f52f3905..52e15cce87 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -38,7 +38,6 @@ */ /*#include <config_cmd_default.h>*/ -#define CONFIG_CMD_DFL #define CONFIG_CMD_FLASH #define CONFIG_CMD_SAVEENV diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 01360f6cbd..4ac17cc636 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -122,7 +122,7 @@ #define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -#define CONFIG_CMD_SETECPR /* Evaluate expressions */ +#define CONFIG_CMD_SETEXPR /* Evaluate expressions */ #undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h index dc5ec3aa82..5d0c385987 100644 --- a/include/configs/quad100hd.h +++ b/include/configs/quad100hd.h @@ -69,7 +69,6 @@ #define CONFIG_CMD_I2C #undef CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 -#undef CONFIG_CMD_LOG #undef CONFIG_CMD_MII #define CONFIG_CMD_NAND #undef CONFIG_CMD_PING diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 0ce3fa864c..9cdfc147e9 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -15,7 +15,6 @@ */ #include <config_cmd_default.h> -#define CONFIG_CMD_DFL #define CONFIG_CMD_CACHE #define CONFIG_CMD_FLASH #define CONFIG_CMD_PCI diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index 73d2a87596..708bff7bb7 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -41,7 +41,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_NFS -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SF #define CONFIG_CMD_RUN diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index 1e71bcc3ef..9c32bfc58b 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -37,7 +37,6 @@ #define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_NFS -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_CMD_RUN #define CONFIG_CMD_SAVEENV diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h index 4747fbd351..95028de059 100644 --- a/include/configs/u8500_href.h +++ b/include/configs/u8500_href.h @@ -95,7 +95,6 @@ #define CONFIG_CMD_MMC #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EMMC #define CONFIG_CMD_SOURCE #define CONFIG_CMD_I2C diff --git a/include/configs/zeus.h b/include/configs/zeus.h index 63279b01ce..2556e3b3ef 100644 --- a/include/configs/zeus.h +++ b/include/configs/zeus.h @@ -78,7 +78,6 @@ #define CONFIG_CMD_ELF #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ -#define CONFIG_CMD_LOG #define CONFIG_CMD_MII #define CONFIG_CMD_NET #define CONFIG_CMD_NFS diff --git a/include/u-boot/md5.h b/include/u-boot/md5.h index 08924cce3c..e09c16a6e3 100644 --- a/include/u-boot/md5.h +++ b/include/u-boot/md5.h @@ -11,7 +11,10 @@ struct MD5Context { __u32 buf[4]; __u32 bits[2]; - unsigned char in[64]; + union { + unsigned char in[64]; + __u32 in32[16]; + }; }; /* @@ -153,8 +153,8 @@ MD5Final(unsigned char digest[16], struct MD5Context *ctx) byteReverse(ctx->in, 14); /* Append length in bits and transform */ - ((__u32 *) ctx->in)[14] = ctx->bits[0]; - ((__u32 *) ctx->in)[15] = ctx->bits[1]; + ctx->in32[14] = ctx->bits[0]; + ctx->in32[15] = ctx->bits[1]; MD5Transform(ctx->buf, (__u32 *) ctx->in); byteReverse((unsigned char *) ctx->buf, 4); diff --git a/tools/patman/README b/tools/patman/README index 587c97fc88..7ba9e804d5 100644 --- a/tools/patman/README +++ b/tools/patman/README @@ -93,17 +93,17 @@ How to run it First do a dry run: -$ ./tools/scripts/patman/patman -n +$ ./tools/patman/patman -n If it can't detect the upstream branch, try telling it how many patches there are in your series: -$ ./tools/scripts/patman/patman -n -c5 +$ ./tools/patman/patman -n -c5 This will create patch files in your current directory and tell you who it is thinking of sending them to. Take a look at the patch files. -$ ./tools/scripts/patman/patman -n -c5 -s1 +$ ./tools/patman/patman -n -c5 -s1 Similar to the above, but skip the first commit and take the next 5. This is useful if your top commit is for setting up testing. @@ -197,7 +197,7 @@ patch series and see how the patches turn out. Where Patches Are Sent ====================== -Once the patches are created, patman sends them using gti send-email. The +Once the patches are created, patman sends them using git send-email. The whole series is sent to the recipients in Series-to: and Series-cc. You can Cc individual patches to other people with the Cc: tag. Tags in the subject are also picked up to Cc patches. For example, a commit like this: |