global_data: Reduce the size of mon_len

This is the length of the U-Boot binary, which is typically 200-800KB
and certainly not larger than 4GB. Use a 32-bit value to save space in
global_data and move it up to be with fields of the same alignment.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/board_f.c b/common/board_f.c
index eb1a5f0e1e9f604d042b78087e49dc9159ac16bf..d9fe6f997ab746a25ebb4cb2a190e36ecd5ec66f 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -340,7 +340,7 @@ __weak int arch_setup_dest_addr(void)
 
 static int setup_dest_addr(void)
 {
-       debug("Monitor len: %08lX\n", gd->mon_len);
+       debug("Monitor len: %08x\n", gd->mon_len);
        /*
         * Ram is setup, size stored in gd !!
         */
@@ -477,7 +477,7 @@ static int reserve_uboot(void)
                gd->relocaddr &= ~(65536 - 1);
        #endif
 
-               debug("Reserving %ldk for U-Boot at: %08lx\n",
+               debug("Reserving %dk for U-Boot at: %08lx\n",
                      gd->mon_len >> 10, gd->relocaddr);
        }
 

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 0c8801500f07a27373f2b9452ac1e341ac55df25..06523cab5225bb76c4bc6e7ee5f13206687e7b29 100644 (file)
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -71,6 +71,10 @@ struct global_data {
         * @mem_clk: memory clock rate in Hz
         */
        unsigned int mem_clk;
+       /**
+        * @mon_len: monitor length in bytes
+        */
+       unsigned int mon_len;
        /**
         * @env_addr: address of environment structure
         *
@@ -115,10 +119,6 @@ struct global_data {
         * @ram_size: RAM size in bytes
         */
        phys_size_t ram_size;
-       /**
-        * @mon_len: monitor length in bytes
-        */
-       unsigned long mon_len;
        /**
         * @irq_sp: IRQ stack pointer
         */