Changeset 12310

Timestamp:

06/17/09 22:22:05 (4 years ago)

Author:

BrainSlayer

Message:

use printf rather than puts (includes printf implementation), add nvram functions to check system variables, this allows to boot always redboot if configured from dd-wrt itself

Location:

ar5315_microredboot/microredboot/boot/src

Files:

• Makefile (modified) (2 diffs)
• head-ar5315.S (modified) (1 diff)
• head-ar531x.S (modified) (6 diffs)
• head.S (modified) (1 diff)
• lib/lib.c (added)
• lib/print.c (added)
• lib/print.h (added)
• lib/printf.c (added)
• lib/printf.h (added)
• misc_lzma.c (modified) (17 diffs)
• print.c (deleted)
• print.h (deleted)
• printf.c (deleted)
• printf.h (deleted)
• uncompress-ar531x.h (modified) (1 diff)

ar5315_microredboot/microredboot/boot/src/Makefile

@@ -27 +27 @@
 LD = /xfs/toolchains/staging_dir_mips/bin/mips-linux-ld
 OBJCOPY = /xfs/toolchains/staging_dir_mips/bin/mips-linux-objcopy 
-CFLAGS = -Os -G 0 -mabi=32 -mno-abicalls -fno-pic -pipe -msoft-float -ffreestanding -march=mips32 -Iinclude -Iinclude/asm-mips/mach-atheros -Iinclude/asm/mach-generic -DMIPSEB -D_MIPSEB -D__MIPSEB -D__MIPSEB__ -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32 -D__KERNEL__
+CFLAGS = -Os -G 0 -mabi=32 -mno-abicalls -fno-pic -pipe -msoft-float -ffreestanding -march=mips32 -Iinclude -I. -Iinclude/asm-mips/mach-atheros -Iinclude/asm/mach-generic -DMIPSEB -D_MIPSEB -D__MIPSEB -D__MIPSEB__ -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32 -D__KERNEL__
 CFLAGS+= -DCONFIG_MIPS_L1_CACHE_SHIFT=5 -DCONFIG_PAGE_SIZE_4KB -DCONFIG_32BIT -DCONFIG_BOOTLOADER
 AFLAGS = -Os -D__ASSEMBLY__ -G 0 -mabi=32 -mno-abicalls -fno-pic -pipe -msoft-float -ffreestanding -march=mips32 -Iinclude -Iinclude/asm-mips/mach-atheros -Iinclude/asm/mach-generic -DMIPSEB -D_MIPSEB -D__MIPSEB -D__MIPSEB__ -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32
@@ -46 +46 @@
 
 HEAD             = head.o
-OBJS             = misc_lzma.o
+OBJS             = misc_lzma.o lib/lib.o lib/print.o lib/printf.o
 MEMCPY           = memcpy.o memset.o
 # CFLAGS         = $(CPPFLAGS) -O2 -DSTDC_HEADERS $(CFLAGS_BOOT)

ar5315_microredboot/microredboot/boot/src/head-ar5315.S

@@ -1 +1 @@
 /*
- * lzma_misc.c
+ * head-ar5315.S
  * originally written for xscale based linux kernel decompression
  * now adapted for AR531X based redboot stub and kernel loader

ar5315_microredboot/microredboot/boot/src/head-ar531x.S

@@ -1 +1 @@
 /*
- *  linux/arch/mips/boot/compressed/head-ar531x.S
+ *  head-ar531x.S
  *
+ *  Copyright (C) 2009 NewMedia-NET GmbH (derived from linux boot code)
  *  Copyright (C) 2003 Instant802 Networks, Inc.
  *  Copyright (C) 2001 Atheros Communications, Inc.,  All Rights Reserved.
  *
- *  License: 
+ *  originally written for xscale based linux kernel decompression
+ *  now adapted for AR531X based redboot stub and kernel loader
+ *  copyright 2009 Sebastian Gottschall / NewMedia-NET GmbH / DD-WRT.COM
+ *  licensed under GPL conditions
+ *  based on Vxworks sources from Atheros Communications, Inc.
+ *
+ *
+ *  License: GPL
  */
 
@@ -24 +32 @@
 #include "mips4Kx.h"
 #include "ar531xreg.h"
+#include "ar531xSio.h"
 
 /*
@@ -217 +226 @@
 
         /* Want this fairly early in output file */
-        .asciz "Copyright 2009 DD-WRT.COM"
+        .asciz "MicroRedBoot Copyright 2009 NewMedia-NET GmbH / DD-WRT.COM"
         .align 4
 
@@ -627 +636 @@
         mtc0    zero, CP0_COMPARE
 
+        li      a0, KSEG1|AR531X_RESET
+        lw      t0, 0(a0)
+        and     t0, ~RESET_APB
+        or      t0, RESET_UART0
+        sw      t0, 0(a0)
+        lw      zero, 0(a0)             # flush
+
+        and     t0, ~RESET_UART0
+        sw      t0, 0(a0)
+        lw      zero, 0(a0)             # flush
+
+1:      /* Use internal clocking */
+        li      a0, KSEG1|AR531X_CLOCKCTL
+        lw      t0, 0(a0)
+        and     t0, ~CLOCKCTL_UART0
+        sw      t0, 0(a0)
+
+        /* put UART CLOCK RATE into a0 */
+        li      a0, KSEG1|AR5312_SCRATCH
+        lw      a0, 0(a0)
+        bnez    a0, 3f                  # CPU Clock freq specified?
+        li      a0, 180000000           # No: assume 180MHz
+3:      srl     a0, 2                   # derive UART freq
+        div     a0, 115200
+        div     a0, 16
+        srl     t2, a0, 8
+        andi    t1, a0, 0xff            # AR531X_NS16550_DLL_VALUE
+        andi    t2, 0xff                # AR531X_NS16550_DLM_VALUE
+        
+2:
+
+        /* Init UART @ 115200 baud */
+        li      a0, KSEG1|AR531X_UART0
+        li      t0, LCR_DLAB            # access divisor latch
+        sw      t0, LCR<<2(a0)
+        sw      t1, DLL<<2(a0)          # divisor low
+        sw      t2, DLM<<2(a0)          # divisor high
+        li      t0, CHAR_LEN_8          # 8b mode
+        sw      t0, LCR<<2(a0)
+        sw      zero, IER<<2(a0)        # disable interrupts
+        li      t0, FCR_EN|FCR_RXCLR|FCR_TXCLR
+
+        sw      t0, FCR<<2(a0)          # reset and enable fifos
+
+
+
         /* Set watchpoint for low memory to debug null pointers */
         li      t0, 0x40000ff8          # G + Ignore 11:3 in check
@@ -661 +716 @@
         bal     romCacheInit            # init/invalidate cache tags
 
+        nop
+        la      t0,_text               # dest addr
+#       la      t1,_text          # source addr
+#       lar     t1,__AR531X_start
+        la      t1,_text-0x80400000+BOOTBASE          # source addr
+        la      t3,_text+0x10000       # end dest addr
+3:      
+        lw      v0,0(t1)                # get word
+        sw      v0,0(t0)                # write word
+        addiu   t1,t1,4
+        addiu   t0,t0,4
+        bne     t0,t3,3b
+        nop
+        la      v0,4f                   # RAM address to go to
+        jr      v0
+        nop
+4:       
+        nop
+
         /* Want to switch to cached segment now... */
 
@@ -721 +795 @@
         nop
         bal     ramCacheInit            # init/invalidate cache tags
+        nop
+
+        la      t0,_text               # dest addr
+#       la      t1,_text          # source addr
+#       lar     t1,__AR531X_start
+        la      t1,_text-0x80400000+BOOTBASE          # source addr
+        la      t3,_text+0x10000       # end dest addr
+3:      
+        lw      v0,0(t1)                # get word
+        sw      v0,0(t0)                # write word
+        addiu   t1,t1,4
+        addiu   t0,t0,4
+        bne     t0,t3,3b
+        nop
+        la      v0,4f                   # RAM address to go to
+        jr      v0
+        nop
+4:       
         nop
 

ar5315_microredboot/microredboot/boot/src/head.S

@@ -68 +68 @@
 
         /* Jump to the kernel's entry point */
-        la      t1, bootoffset
+        la      t1, bootoffset  
         nop
         lw      t0, 0(t1)

ar5315_microredboot/microredboot/boot/src/misc_lzma.c

@@ -66 +66 @@
  * Do the lzma decompression
  */
-
-static void print_hex(int val)
-{
-        static char *xlate = "0123456789abcdef";
-        int i;
-
-        puts("0x");
-
-        for (i = 28; i >= 0; i -= 4) {
-                putc(xlate[(val >> i) & 0xf]);
-        }
-}
 
 static int disaster = 0;
@@ -106 +94 @@
                 if (disaster) {
                         error
-                            ("\r\ndata corrupted in recovery RedBoot too, this is a disaster condition. please re-jtag\r\n");
+                            ("\ndata corrupted in recovery RedBoot too, this is a disaster condition. please re-jtag\n");
                 }
                 disaster = 1;
-                puts("\r\ndata corrupted!\r\nswitching to recovery RedBoot\r\nloading");
+                puts("\ndata corrupted!\nswitching to recovery RedBoot\nloading");
                 inbuf = input_data;
                 insize = &input_data_end[0] - &input_data[0];
@@ -129 +117 @@
                         if (disaster) {
                                 error
-                                    ("data corrupted in recovery RedBoot too, this is a disaster condition. please re-jtag\r\n");
+                                    ("data corrupted in recovery RedBoot too, this is a disaster condition. please re-jtag\n");
                         }
                         disaster = 1;
-                        puts("\r\ndata corrupted!\r\nswitching to recovery RedBoot\r\nloading");
+                        puts("\ndata corrupted!\nswitching to recovery RedBoot\nloading");
                         inbuf = input_data;
                         insize = &input_data_end[0] - &input_data[0];
@@ -168 +156 @@
         *buffer = &val;
         if (icnt++ % (1024 * 10) == 0)
-                puts(".");
+                putc('.');
         return LZMA_RESULT_OK;
 }
@@ -201 +189 @@
                     || !strncmp(fis->name, "vmlinux", 7)
                     || !strcmp(fis->name, "kernel")) {
-                        puts("found bootable image: ");
-                        puts(fis->name);
-                        puts(" at ");
-                        print_hex(fis->flash_base);
-                        puts(" entrypoint ");
-                        print_hex(fis->entry_point);
-                        puts("\r\n");
+                        printf
+                            ("found bootable image: [%s] at [0x%08X] EP [0x%08X]\n",
+                             fis->name, fis->flash_base, fis->entry_point);
                         bootoffset = fis->entry_point;
                         output_data = (uch *) fis->mem_base;
@@ -219 +203 @@
                 count++;
         }
-        puts("no bootable image found, try default location 0xbfc10000\r\n");
+        puts("no bootable image found, try default location 0xbfc10000\n");
         bootoffset = 0x80041000;
         output_data = (uch *) 0x80041000;
@@ -260 +244 @@
         arch_error(x);
 
-        puts("\r\n\r\n");
-        puts(x);
-        puts("\r\n\r\n -- System halted");
+        printf("\n\n%s\n\n -- System halted", x);
 
         while (1) ;             /* Halt */
@@ -336 +318 @@
 
 /*
- * 
+ * udelay implementation based on cpu cycle counter
  */
 static void udelay(int us)
@@ -498 +480 @@
         __u32 cs_addrmask;
 } 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}
+        {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}//
 };
 
@@ -518 +493 @@
         __s8 rx_cnt;
 } 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},
+        {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},  //
 };
 
@@ -634 +598 @@
                 break;
         default:
-                puts("Read of flash device signature failed!\r\n");
+                puts("Read of flash device signature failed!\n");
                 return (0);
         }
@@ -647 +611 @@
         struct opcodes *ptr_opcode;
         __u32 temp, reg;
-        puts("erasing nvram at ");
-        print_hex(flashbase + offset);
-        puts("\r\n");
+        printf("erasing nvram at [0x%08X]\n", flashbase + offset);
 
         ptr_opcode = &stm_opcodes[SPI_SECTOR_ERASE];
@@ -666 +628 @@
         busy_wait(spiflash_sendcmd(SPI_RD_STATUS, 0) & SPI_STATUS_WIP, 20);
 
-        puts("done\r\n");
+        puts("done\n");
         return 0;
 }
 
+static int flashdetected = 0;
 static int flashdetect(void)
 {
+        if (flashdetected)
+                return 0;
         flashsize = 8 * 1024 * 1024;
         flashbase = 0xa8000000;
         int index = 0;
         if (!(index = spiflash_probe_chip())) {
-                puts("Found no serial flash device, cannot reset to factory defaults\r\n");
+                puts("Found no serial flash device, cannot reset to factory defaults\n");
                 return -1;
         } else {
                 flashsize = flashconfig_tbl[index].byte_cnt;
                 sectorsize = flashconfig_tbl[index].sector_size;
-                puts("Found Flash device SIZE=");
-                print_hex(flashsize);
-                puts(" SECTORSIZE=");
-                print_hex(sectorsize);
-                puts(" FLASHBASE=");
                 if (flashsize == 8 * 1024 * 1024)
                         flashbase = 0xa8000000;
                 else
                         flashbase = 0xbfc00000;
-                print_hex(flashbase);
-                puts("\r\n");
-        }
+                printf
+                    ("Found Flash device SIZE=0x%08X SECTORSIZE=0x%08X FLASHBASE=0x%08X\n",
+                     flashsize, sectorsize, flashbase);
+        }
+        flashdetected = 1;
         return 0;
 
+}
+
+struct nvram_header {
+        __u32 magic;
+        __u32 len;
+        __u32 crc_ver_init;     /* 0:7 crc, 8:15 ver, 16:27 init, mem. test 28, 29-31 reserved */
+        __u32 config_refresh;   /* 0:15 config, 16:31 refresh */
+        __u32 config_ncdl;      /* ncdl values for memc */
+};
+
+struct nvram_tuple {
+        char *name;
+        char *value;
+        struct nvram_tuple *next;
+};
+
+#define NVRAM_SPACE 0x10000
+#define NVRAM_MAGIC                     0x48534C46      /* 'NVFL' */
+
+static char nvram_buf[65536] __attribute__((aligned(4096))) = {0};//
+
+/*
+ * simple dd-wrt nvram implementation (read only)
+ */
+static void nvram_init(void)
+{
+        struct nvram_header *header;
+        __u32 off, lim;
+        int i;
+        flashdetect();
+
+        header =
+            (struct nvram_header *)(flashbase + flashsize - (sectorsize * 3));
+        if (header->magic == NVRAM_MAGIC && header->len > 0
+            && header->len <= NVRAM_SPACE) {
+                printf("DD-WRT nvram with size = %d found\n", header->len);
+                memcpy(nvram_buf, header, NVRAM_SPACE);
+        }
+}
+
+static char *nvram_get(const char *name)
+{
+        char *var, *value, *end, *eq;
+
+        if (!name)
+                return NULL;
+
+        if (!nvram_buf[0])
+                nvram_init();
+
+        /* Look for name=value and return value */
+        var = &nvram_buf[sizeof(struct nvram_header)];
+        end = nvram_buf + sizeof(nvram_buf) - 2;
+        end[0] = end[1] = '\0';
+        for (; *var; var = value + strlen(value) + 1) {
+                if (!(eq = strchr(var, '=')))
+                        break;
+                value = eq + 1;
+                if ((eq - var) == strlen(name)
+                    && strncmp(var, name, (eq - var)) == 0)
+                        return value;
+        }
+
+        return NULL;
 }
 
@@ -705 +731 @@
 
         arch_decomp_setup();
-
-        puts("MicroRedBoot v1.2, (c) 2009 DD-WRT.COM (");
-        puts(__DATE__);
-        puts(")\r\n");
-        if (resetTouched()) {
-                puts("Reset Button triggered\r\nBooting Recovery RedBoot\r\n");
+        printf("MicroRedBoot v1.2, (c) 2009 DD-WRT.COM (%s)\n", __DATE__);
+        nvram_init();
+        char *resetbutton = nvram_get("resetbutton_enable");
+        if (resetTouched() || (resetbutton && !strcmp(resetbutton, "1"))) {
+                puts("Reset Button triggered\nBooting Recovery RedBoot\n");
                 int count = 5;
                 while (count--) {
@@ -718 +743 @@
                 }
                 if (count <= 0) {
-                        puts("reset button 5 seconds pushed, erasing nvram\r\n");
+                        puts("reset button 5 seconds pushed, erasing nvram\n");
                         if (!flashdetect())
                                 flash_erase_nvram(flashsize, sectorsize);
@@ -728 +753 @@
                 flashdetect();
                 linuxaddr = getLinux();
-                puts("Booting Linux\r\n");
+                puts("Booting Linux\n");
                 resettrigger = 1;
                 /* initialize clock */
@@ -759 +784 @@
         puts("loading");
         lzma_unzip();
-        puts("\r\n\r\n\r\n");
+        puts("\n\n\n");
 
         return output_ptr;

ar5315_microredboot/microredboot/boot/src/uncompress-ar531x.h

@@ -76 +76 @@
 
         while ((c = *s++)) {
+                if (c=='\n')
+                    putc('\r');
                 putc(c);
         }