Changeset 12295

Timestamp:

06/16/09 04:12:29 (4 years ago)

Author:

BrainSlayer

Message:

make it about 2 kb smaller

Location:

ar5315_microredboot/microredboot/boot/src

Files:

• Makefile (modified) (1 diff)
• lib/LzmaDecode.c (modified) (12 diffs)
• lib/LzmaDecode.h (modified) (2 diffs)
• misc_lzma.c (modified) (11 diffs)

ar5315_microredboot/microredboot/boot/src/Makefile

@@ -47 +47 @@
 HEAD             = head.o
 OBJS             = misc_lzma.o
-MEMCPY           = memcpy.o memset.o
+MEMCPY           = memset.o
 # CFLAGS         = $(CPPFLAGS) -O2 -DSTDC_HEADERS $(CFLAGS_BOOT)
 ZLDFLAGS         = -G 0 -static -X -T ld.script

ar5315_microredboot/microredboot/boot/src/lib/LzmaDecode.c

@@ -45 +45 @@
 } CRangeDecoder;
 
-Byte RangeDecoderReadByte(CRangeDecoder *rd)
+static Byte RangeDecoderReadByte(CRangeDecoder *rd)
 {
   if (rd->Buffer == rd->BufferLim)
@@ -66 +66 @@
 #define ReadByte (RangeDecoderReadByte(rd))
 
-void RangeDecoderInit(CRangeDecoder *rd)
+static void RangeDecoderInit(CRangeDecoder *rd)
 {
   int i;
@@ -86 +86 @@
 #define RC_NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | ReadByte; }
 
-UInt32 RangeDecoderDecodeDirectBits(CRangeDecoder *rd, int numTotalBits)
+static UInt32 RangeDecoderDecodeDirectBits(CRangeDecoder *rd, int numTotalBits)
 {
   RC_INIT_VAR
@@ -114 +114 @@
 }
 
-int RangeDecoderBitDecode(CProb *prob, CRangeDecoder *rd)
+static int RangeDecoderBitDecode(CProb *prob, CRangeDecoder *rd)
 {
   UInt32 bound = (rd->Range >> kNumBitModelTotalBits) * *prob;
@@ -152 +152 @@
 #define RC_GET_BIT(prob, mi) RC_GET_BIT2(prob, mi, ; , ;)               
 
-int RangeDecoderBitTreeDecode(CProb *probs, int numLevels, CRangeDecoder *rd)
+static int RangeDecoderBitTreeDecode(CProb *probs, int numLevels, CRangeDecoder *rd)
 {
   int mi = 1;
@@ -174 +174 @@
 }
 
-int RangeDecoderReverseBitTreeDecode(CProb *probs, int numLevels, CRangeDecoder *rd)
+static int RangeDecoderReverseBitTreeDecode(CProb *probs, int numLevels, CRangeDecoder *rd)
 {
   int mi = 1;
@@ -199 +199 @@
 }
 
-Byte LzmaLiteralDecode(CProb *probs, CRangeDecoder *rd)
+static Byte LzmaLiteralDecode(CProb *probs, CRangeDecoder *rd)
 { 
   int symbol = 1;
@@ -221 +221 @@
 }
 
-Byte LzmaLiteralDecodeMatch(CProb *probs, CRangeDecoder *rd, Byte matchByte)
+static Byte LzmaLiteralDecodeMatch(CProb *probs, CRangeDecoder *rd, Byte matchByte)
 { 
   int symbol = 1;
@@ -279 +279 @@
 #define kNumLenProbs (LenHigh + kLenNumHighSymbols) 
 
-int LzmaLenDecode(CProb *p, CRangeDecoder *rd, int posState)
+static int LzmaLenDecode(CProb *p, CRangeDecoder *rd, int posState)
 {
   if(RangeDecoderBitDecode(p + LenChoice, rd) == 0)
@@ -340 +340 @@
 } LzmaVarState;
 
-int LzmaDecoderInit(
+static int LzmaDecoderInit(
     unsigned char *buffer, UInt32 bufferSize,
     int lc, int lp, int pb,
@@ -371 +371 @@
 }
 
-int LzmaDecode(unsigned char *buffer, 
+static int LzmaDecode(unsigned char *buffer, 
     unsigned char *outStream, UInt32 outSize,
     UInt32 *outSizeProcessed)
@@ -415 +415 @@
 #else
 
-int LzmaDecode(
+static int LzmaDecode(
     Byte *buffer, UInt32 bufferSize,
     int lc, int lp, int pb,

ar5315_microredboot/microredboot/boot/src/lib/LzmaDecode.h

@@ -66 +66 @@
 
 #ifdef _LZMA_OUT_READ
-int LzmaDecoderInit(
+static int LzmaDecoderInit(
     unsigned char *buffer, UInt32 bufferSize,
     int lc, int lp, int pb,
@@ -73 +73 @@
 #endif
 
-int LzmaDecode(
+static int LzmaDecode(
     unsigned char *buffer, 
   #ifndef _LZMA_OUT_READ

ar5315_microredboot/microredboot/boot/src/misc_lzma.c

@@ -189 +189 @@
  * searches for a directory entry named linux* vmlinux* or kernel and returns its flash address (it also initializes entrypoint and load address)
  */
-unsigned int getLinux(void)
+static unsigned int getLinux(void)
 {
         int count;
@@ -215 +215 @@
         puts("no bootable image found, try default location 0xbfc10000\r\n");
         bootoffset = 0x80041000;
-        output_data = (uch *)0x80041000;
+        output_data = (uch *) 0x80041000;
         return 0xbfc10000;
 }
@@ -225 +225 @@
 static int resettrigger = 0;
 
-int fill_inbuf(void)
+static int fill_inbuf(void)
 {
         if (insize != 0)
                 error("ran out of input data");
         if (resettrigger) {
-                inbuf = (uch *)linuxaddr;
+                inbuf = (uch *) linuxaddr;
                 insize = 0x400000;
                 inptr = 1;
@@ -491 +491 @@
         __u32 sector_size;
         __u32 cs_addrmask;
-} flashconfig_tbl[MAX_FLASH] = {
-        {
-        0, 0, 0, 0}, {
-        STM_1MB_BYTE_COUNT, STM_1MB_SECTOR_COUNT, STM_1MB_SECTOR_SIZE, 0x0},
-        {
-        STM_2MB_BYTE_COUNT, STM_2MB_SECTOR_COUNT, STM_2MB_SECTOR_SIZE, 0x0},
-        {
-        STM_4MB_BYTE_COUNT, STM_4MB_SECTOR_COUNT, STM_4MB_SECTOR_SIZE, 0x0},
-        {
-        STM_8MB_BYTE_COUNT, STM_8MB_SECTOR_COUNT, STM_8MB_SECTOR_SIZE, 0x0},
-        {
-        STM_16MB_BYTE_COUNT, STM_16MB_SECTOR_COUNT,
-                    STM_16MB_SECTOR_SIZE, 0x0}
+} static flashconfig_tbl[MAX_FLASH] = {
+        {
+         0, 0, 0, 0}, {
+                       STM_1MB_BYTE_COUNT, STM_1MB_SECTOR_COUNT,
+                       STM_1MB_SECTOR_SIZE, 0x0},
+        {
+         STM_2MB_BYTE_COUNT, STM_2MB_SECTOR_COUNT, STM_2MB_SECTOR_SIZE, 0x0},
+        {
+         STM_4MB_BYTE_COUNT, STM_4MB_SECTOR_COUNT, STM_4MB_SECTOR_SIZE, 0x0},
+        {
+         STM_8MB_BYTE_COUNT, STM_8MB_SECTOR_COUNT, STM_8MB_SECTOR_SIZE, 0x0},
+        {
+         STM_16MB_BYTE_COUNT, STM_16MB_SECTOR_COUNT,
+         STM_16MB_SECTOR_SIZE, 0x0}
 };
 
@@ -510 +511 @@
         __s8 tx_cnt;
         __s8 rx_cnt;
-} stm_opcodes[] = {
-        {
-        STM_OP_WR_ENABLE, 1, 0}, {
-        STM_OP_WR_DISABLE, 1, 0}, {
-        STM_OP_RD_STATUS, 1, 1}, {
-        STM_OP_WR_STATUS, 1, 0}, {
-        STM_OP_RD_DATA, 4, 4}, {
-        STM_OP_FAST_RD_DATA, 5, 0}, {
-        STM_OP_PAGE_PGRM, 8, 0}, {
-        STM_OP_SECTOR_ERASE, 4, 0}, {
-        STM_OP_BULK_ERASE, 1, 0}, {
-        STM_OP_DEEP_PWRDOWN, 1, 0}, {
-STM_OP_RD_SIG, 4, 1},};
+} static stm_opcodes[] = {
+        {
+         STM_OP_WR_ENABLE, 1, 0}, {
+                                   STM_OP_WR_DISABLE, 1, 0}, {
+                                                              STM_OP_RD_STATUS,
+                                                              1, 1}, {
+                                                                      STM_OP_WR_STATUS,
+                                                                      1, 0}, {
+                                                                              STM_OP_RD_DATA,
+                                                                              4,
+                                                                              4},
+        {
+         STM_OP_FAST_RD_DATA, 5, 0}, {
+                                      STM_OP_PAGE_PGRM, 8, 0}, {
+                                                                STM_OP_SECTOR_ERASE,
+                                                                4, 0}, {
+                                                                        STM_OP_BULK_ERASE,
+                                                                        1, 0}, {
+                                                                                STM_OP_DEEP_PWRDOWN,
+                                                                                1,
+                                                                                0},
+        {
+         STM_OP_RD_SIG, 4, 1},
+};
 
 static __u32 spiflash_regread32(int reg)
@@ -538 +550 @@
         return;
 }
-
 
 #define busy_wait(condition, wait) \
@@ -634 +645 @@
         puts("\r\n");
 
-
         ptr_opcode = &stm_opcodes[SPI_SECTOR_ERASE];
 
         temp = ((__u32)offset << 8) | (__u32)(ptr_opcode->code);
-        spiflash_sendcmd(SPI_WRITE_ENABLE,0);
+        spiflash_sendcmd(SPI_WRITE_ENABLE, 0);
         busy_wait((reg = spiflash_regread32(SPI_FLASH_CTL)) & SPI_CTL_BUSY, 0);
 
         spiflash_regwrite32(SPI_FLASH_OPCODE, temp);
 
-        reg = (reg & ~SPI_CTL_TX_RX_CNT_MASK) | ptr_opcode->tx_cnt | SPI_CTL_START;
+        reg =
+            (reg & ~SPI_CTL_TX_RX_CNT_MASK) | ptr_opcode->tx_cnt |
+            SPI_CTL_START;
         spiflash_regwrite32(SPI_FLASH_CTL, reg);
 
         busy_wait(spiflash_sendcmd(SPI_RD_STATUS, 0) & SPI_STATUS_WIP, 20);
-
 
         puts("done\r\n");
@@ -656 +667 @@
 decompress_kernel(ulg output_start, ulg free_mem_ptr_p, ulg free_mem_ptr_end_p)
 {
-        output_data = (uch *) output_start;     /* Points to kernel start */
+        output_data = (uch *) output_start;
         free_mem_ptr = free_mem_ptr_p;
         free_mem_ptr_end = free_mem_ptr_end_p;
@@ -669 +680 @@
                 int count = 5;
                 while (count--) {
-                        if (!resetTouched()) // check if reset button is unpressed again
+                        if (!resetTouched())    // check if reset button is unpressed again
                                 break;
                         udelay(1000000);
@@ -685 +696 @@
                                 sectorsize = flashconfig_tbl[index].sector_size;
                                 puts("\r\n");
-                                flash_erase_nvram(flashconfig_tbl[index].
-                                                  byte_cnt,
-                                                  flashconfig_tbl[index].
-                                                  sector_size);
+                                flash_erase_nvram(flashconfig_tbl
+                                                  [index].byte_cnt,
+                                                  flashconfig_tbl
+                                                  [index].sector_size);
                         }
 
@@ -702 +713 @@
                 unsigned int mask = RESET_ENET0 | RESET_EPHY0;
                 unsigned int regtmp;
-                
+
                 /* important, enable ethernet bus, if the following lines are not initialized linux will not be able to use the ethernet mac, taken from redboot source */
                 regtmp = sysRegRead(AR2316_AHB_ARB_CTL);