Cleanups on romboot and u-boot.

[openwrt/svn-archive/archive.git] / target / linux / at91-2.6 / image / romboot / patches / 000-fixenv.patch

diff --git a/target/linux/at91-2.6/image/romboot/patches/000-fixenv.patch b/target/linux/at91-2.6/image/romboot/patches/000-fixenv.patch
index 5a08d57be0756c930d225ccf052d7b06a5c73a18..7c285728594fae79970d82b0e1d525ae6d7892ea 100644 (file)
--- a/target/linux/at91-2.6/image/romboot/patches/000-fixenv.patch
+++ b/target/linux/at91-2.6/image/romboot/patches/000-fixenv.patch
@@ -2,56 +2,56 @@ diff -uNr romboot/main.cpp romboot.new/main.cpp
 --- romboot/main.cpp   2004-07-16 17:10:04.000000000 +0200
 +++ romboot.new/main.cpp       2006-03-03 02:27:37.000000000 +0100
 @@ -23,12 +23,12 @@
- #define AT91C_UBOOT_DATAFLASH_ADDR 0xC0008000\r
- \r
- // crystal= 18.432MHz\r
--//#define AT91C_PLLA_VALUE 0x2026BE04 // -> 179.712MHz\r
--//#define AT91C_PLLA_MCK 0x0000202\r
-+#define AT91C_PLLA_VALUE 0x2026BE04 // -> 179.712MHz\r
-+#define AT91C_PLLA_MCK 0x0000202\r
- \r
- // crystal= 20.000MHz\r
--#define AT91C_PLLA_VALUE 0x2023BE04 // -> 180MHz\r
--#define AT91C_PLLA_MCK 0x0000202\r
-+//#define AT91C_PLLA_VALUE 0x2023BE04 // -> 180MHz\r
-+//#define AT91C_PLLA_MCK 0x0000202\r
- \r
- #define DELAY_MAIN_FREQ       1000\r
- #define DISP_LINE_LEN 16\r
+ #define AT91C_UBOOT_DATAFLASH_ADDR 0xC0008000
+ 
+ // crystal= 18.432MHz
+-//#define AT91C_PLLA_VALUE 0x2026BE04 // -> 179.712MHz
+-//#define AT91C_PLLA_MCK 0x0000202
++#define AT91C_PLLA_VALUE 0x2026BE04 // -> 179.712MHz
++#define AT91C_PLLA_MCK 0x0000202
+ 
+ // crystal= 20.000MHz
+-#define AT91C_PLLA_VALUE 0x2023BE04 // -> 180MHz
+-#define AT91C_PLLA_MCK 0x0000202
++//#define AT91C_PLLA_VALUE 0x2023BE04 // -> 180MHz
++//#define AT91C_PLLA_MCK 0x0000202
+ 
+ #define DELAY_MAIN_FREQ       1000
+ #define DISP_LINE_LEN 16
 @@ -151,7 +151,7 @@
- //*-----------------------------------------------------------------------------\r
- void AT91F_DisplayMenu(void)\r
- {\r
--  printf("\n\rATMEL LOADER %s %s %s\n\r", AT91C_VERSION, __DATE__, __TIME__);\r
-+  printf("\n\rFDL LOADER %s %s %s\n\r", AT91C_VERSION, __DATE__, __TIME__);\r
-   printf(menu_separ); \r
-   AT91F_DataflashPrintInfo();\r
-   printf(menu_separ); \r
+ //*-----------------------------------------------------------------------------
+ void AT91F_DisplayMenu(void)
+ {
+-  printf("\n\rATMEL LOADER %s %s %s\n\r", AT91C_VERSION, __DATE__, __TIME__);
++  printf("\n\rFDL LOADER %s %s %s\n\r", AT91C_VERSION, __DATE__, __TIME__);
+   printf(menu_separ); 
+   AT91F_DataflashPrintInfo();
+   printf(menu_separ); 
 @@ -306,6 +306,19 @@
-   AT91F_SetPLL();\r
- }\r
- \r
-+void LedCode(void)\r
-+{\r
-+      int *pRegister;\r
-+      pRegister = (int *)0xFFFFF800; // Enable port C peripheral reg\r
-+        *pRegister = 0x3c00;\r
-+        pRegister = (int *)0xFFFFF810; // Output Enable reg\r
-+        *pRegister = 0x3c00;\r
-+        pRegister = (int *)0xFFFFF830; // Set data\r
-+        *pRegister = 0x1400;\r
-+        pRegister = (int *)0xFFFFF834; // Clear bits\r
-+        *pRegister = 0x2800;\r
-+}\r
-+\r
- void AT91F_StartUboot(unsigned int dummy, void *pvoid)\r
- {\r
-   printf("Load U-BOOT from dataflash[%x] to SDRAM[%x]\n\r", AT91C_UBOOT_DATAFLASH_ADDR, AT91C_UBOOT_ADDR);\r
+   AT91F_SetPLL();
+ }
+ 
++void LedCode(void)
++{
++      int *pRegister;
++      pRegister = (int *)0xFFFFF800; // Enable port C peripheral reg
++        *pRegister = 0x3c00;
++        pRegister = (int *)0xFFFFF810; // Output Enable reg
++        *pRegister = 0x3c00;
++        pRegister = (int *)0xFFFFF830; // Set data
++        *pRegister = 0x1400;
++        pRegister = (int *)0xFFFFF834; // Clear bits
++        *pRegister = 0x2800;
++}
++
+ void AT91F_StartUboot(unsigned int dummy, void *pvoid)
+ {
+   printf("Load U-BOOT from dataflash[%x] to SDRAM[%x]\n\r", AT91C_UBOOT_DATAFLASH_ADDR, AT91C_UBOOT_ADDR);
 @@ -313,6 +326,7 @@
-   printf("Set PLLA to 180Mhz and Master clock to 60Mhz and start U-BOOT\n\r");\r
-   //* Reset registers\r
-   AT91F_ResetRegisters();\r
-+  LedCode();\r
-   Jump(AT91C_UBOOT_ADDR);\r
-   while(1);\r
- }\r
+   printf("Set PLLA to 180Mhz and Master clock to 60Mhz and start U-BOOT\n\r");
+   //* Reset registers
+   AT91F_ResetRegisters();
++  LedCode();
+   Jump(AT91C_UBOOT_ADDR);
+   while(1);
+ }