Merge branch 'master' of /home/wd/git/u-boot/custodians

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 05feb39464952f54734211b71bed457882629ad2..f28e88f340f472dc0e96b314cec77572576f04a6 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -153,18 +153,6 @@ static boot_os_fn *boot_os[] = {
 ulong load_addr = CONFIG_SYS_LOAD_ADDR;        /* Default Load Address */
 static bootm_headers_t images;         /* pointers to os/initrd/fdt images */
 
-void __board_lmb_reserve(struct lmb *lmb)
-{
-       /* please define platform specific board_lmb_reserve() */
-}
-void board_lmb_reserve(struct lmb *lmb) __attribute__((weak, alias("__board_lmb_reserve")));
-
-void __arch_lmb_reserve(struct lmb *lmb)
-{
-       /* please define platform specific arch_lmb_reserve() */
-}
-void arch_lmb_reserve(struct lmb *lmb) __attribute__((weak, alias("__arch_lmb_reserve")));
-
 /* Allow for arch specific config before we boot */
 void __arch_preboot_os(void)
 {
@@ -200,15 +188,11 @@ void arch_preboot_os(void) __attribute__((weak, alias("__arch_preboot_os")));
 # error Unknown CPU type
 #endif
 
-static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static void bootm_start_lmb(void)
 {
+#ifdef CONFIG_LMB
        ulong           mem_start;
        phys_size_t     mem_size;
-       void            *os_hdr;
-       int             ret;
-
-       memset ((void *)&images, 0, sizeof (images));
-       images.verify = getenv_yesno ("verify");
 
        lmb_init(&images.lmb);
 
@@ -219,6 +203,20 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        arch_lmb_reserve(&images.lmb);
        board_lmb_reserve(&images.lmb);
+#else
+# define lmb_reserve(lmb, base, size)
+#endif
+}
+
+static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+       void            *os_hdr;
+       int             ret;
+
+       memset ((void *)&images, 0, sizeof (images));
+       images.verify = getenv_yesno ("verify");
+
+       bootm_start_lmb();
 
        /* get kernel image header, start address and length */
        os_hdr = boot_get_kernel (cmdtp, flag, argc, argv,

diff --git a/include/asm-m68k/config.h b/include/asm-m68k/config.h
index 049c44eaf84de0ce67d86afcf0cd016d4bd6c407..36438be112f60a16743a293ae062fec270d67933 100644 (file)
--- a/include/asm-m68k/config.h
+++ b/include/asm-m68k/config.h
@@ -21,4 +21,6 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
+#define CONFIG_LMB
+
 #endif

diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h
index 796707eaf749592618c7d3d4fd344b97d2689274..0d78aa400e547ec683c8c1d704e746bb0917f44e 100644 (file)
--- a/include/asm-ppc/config.h
+++ b/include/asm-ppc/config.h
@@ -21,6 +21,8 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
+#define CONFIG_LMB
+
 #ifndef CONFIG_MAX_MEM_MAPPED
 #if defined(CONFIG_4xx) || defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
 #define CONFIG_MAX_MEM_MAPPED  ((phys_size_t)2 << 30)

diff --git a/include/asm-sparc/config.h b/include/asm-sparc/config.h
index 049c44eaf84de0ce67d86afcf0cd016d4bd6c407..36438be112f60a16743a293ae062fec270d67933 100644 (file)
--- a/include/asm-sparc/config.h
+++ b/include/asm-sparc/config.h
@@ -21,4 +21,6 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
+#define CONFIG_LMB
+
 #endif

diff --git a/include/image.h b/include/image.h
index d2e78fe298376aa17b442d7891ac990ab3c35cb4..4ed03791069b72dcb69a833485861074848c4dab 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -56,6 +56,7 @@
 #include <libfdt.h>
 #include <fdt_support.h>
 #define CONFIG_MD5             /* FIT images need MD5 support */
+#define CONFIG_SHA1            /* and SHA1 */
 #endif
 
 /*
@@ -255,7 +256,7 @@ typedef struct bootm_headers {
 #define        BOOTM_STATE_OS_GO       (0x00000080)
        int             state;
 
-#ifndef USE_HOSTCC
+#ifdef CONFIG_LMB
        struct lmb      lmb;            /* for memory mgmt */
 #endif
 } bootm_headers_t;

diff --git a/include/lmb.h b/include/lmb.h
index 14e8727f0669c5fe98a8e275191fd098986eff34..43082a393fded52ec71f4bca686cffef0e1aedf8 100644 (file)
--- a/include/lmb.h
+++ b/include/lmb.h
@@ -52,6 +52,10 @@ lmb_size_bytes(struct lmb_region *type, unsigned long region_nr)
 {
        return type->region[region_nr].size;
 }
+
+void board_lmb_reserve(struct lmb *lmb);
+void arch_lmb_reserve(struct lmb *lmb);
+
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_LMB_H */

diff --git a/lib_generic/Makefile b/lib_generic/Makefile
index c17179cbc832dcce46bf51184d0ddd23f8f9f5d7..4e4496a552fd06afa23e9bfd3e7309643efe4e38 100644 (file)
--- a/lib_generic/Makefile
+++ b/lib_generic/Makefile
@@ -38,11 +38,11 @@ COBJS-y += ctype.o
 COBJS-y += display_options.o
 COBJS-y += div64.o
 COBJS-y += gunzip.o
-COBJS-y += lmb.o
+COBJS-$(CONFIG_LMB) += lmb.o
 COBJS-y += ldiv.o
 COBJS-$(CONFIG_MD5) += md5.o
 COBJS-y += net_utils.o
-COBJS-y += sha1.o
+COBJS-$(CONFIG_SHA1) += sha1.o
 COBJS-$(CONFIG_SHA256) += sha256.o
 COBJS-y += string.o
 COBJS-y        += strmhz.o

diff --git a/lib_generic/lmb.c b/lib_generic/lmb.c
index 1c6cf7ce000257b1d91729f95f36b51ccdd5020e..c5e75fb3bbd3cebe83624720e1c8247be273fff8 100644 (file)
--- a/lib_generic/lmb.c
+++ b/lib_generic/lmb.c
@@ -334,3 +334,15 @@ int lmb_is_reserved(struct lmb *lmb, phys_addr_t addr)
        }
        return 0;
 }
+
+void __board_lmb_reserve(struct lmb *lmb)
+{
+       /* please define platform specific board_lmb_reserve() */
+}
+void board_lmb_reserve(struct lmb *lmb) __attribute__((weak, alias("__board_lmb_reserve")));
+
+void __arch_lmb_reserve(struct lmb *lmb)
+{
+       /* please define platform specific arch_lmb_reserve() */
+}
+void arch_lmb_reserve(struct lmb *lmb) __attribute__((weak, alias("__arch_lmb_reserve")));