Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r3159 - trunk/doc/hardware/GTA02v3 ([EMAIL PROTECTED])
2. r3160 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
3. r3161 - in trunk/doc/hardware: . GTA02v4
([EMAIL PROTECTED])
4. r3162 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
5. r3163 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-10-14 14:53:42 +0200 (Sun, 14 Oct 2007)
New Revision: 3159
Modified:
trunk/doc/hardware/GTA02v3/gpio.txt
Log:
nGCS3 is now the second chip select for the NOR chip
Modified: trunk/doc/hardware/GTA02v3/gpio.txt
===================================================================
--- trunk/doc/hardware/GTA02v3/gpio.txt 2007-10-14 12:00:02 UTC (rev 3158)
+++ trunk/doc/hardware/GTA02v3/gpio.txt 2007-10-14 12:53:42 UTC (rev 3159)
@@ -14,7 +14,7 @@
GPA11 O ADDR26 NC
GPA12 O nGCS1 n3D_CS
GPA13 O GPA13 nDL_GSM
-GPA14 O GPA14 NC
+GPA14 O nGCS3 nGCS3 NAND
GPA15 O GPA15 H-TP1516
GPA16 O GPA16 NC
GPA17 O CLE NAND_CLE NAND
@@ -24,7 +24,7 @@
GPA21 O nRSTOUT NC
GPA22 O nFCE nNAND_CS0 NAND
-GPACON = 111 1110 0001 1111 1111 1111 = 0x7e1fff
+GPACON = 111 1110 0101 1111 1111 1111 = 0x7e5fff
GPB0 O TOUT0 LED1501
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-14 15:03:17 +0200 (Sun, 14 Oct 2007)
New Revision: 3160
Modified:
trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
add experimental (untested) GTA02v3 and GTA02v4 support to u-boot
Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-10-14 12:53:42 UTC
(rev 3159)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-10-14 13:03:17 UTC
(rev 3160)
@@ -9,12 +9,12 @@
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
+gta02_config \
-+gta02v1_config : unconfig
++gta02v1_config \
++gta02v2_config \
++gta02v3_config \
++gta02v4_config: unconfig
+ @sh board/neo1973/gta02/split_by_variant.sh $@
+
-+gta02v2_config : unconfig
-+ @sh board/neo1973/gta02/split_by_variant.sh $@
-+
gta01_config \
gta01v3_config \
gta01bv2_config \
@@ -91,7 +91,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/gta02/gta02.c
-@@ -0,0 +1,401 @@
+@@ -0,0 +1,431 @@
+/*
+ * (C) 2006-2007 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -246,6 +246,34 @@
+ gpio->GPJCON = 0x1551544;
+ gpio->GPJUP = 0x1ffff;
+ gpio->GPJDAT |= (1 << 4); /* Set GPJ4 to high (nGSM_EN) */
++#elif defined(CONFIG_ARCH_GTA02_v3) || defined(CONFIG_ARCH_GTA02_v4)
++ gpio->GPACON = 0x007E5FFF;
++ gpio->GPADAT |= (1 << 16); /* Set GPA16 to high (nNAND_WP) */
++
++ gpio->GPBCON = 0x00155555;
++ gpio->GPBUP = 0x000007FF;
++
++ gpio->GPCCON = 0x55555155;
++ gpio->GPCUP = 0x0000FFFF;
++
++ gpio->GPDCON = 0x55555555;
++ gpio->GPDUP = 0x0000FFFF;
++
++ gpio->GPECON = 0xAAAAAAAA;
++ gpio->GPEUP = 0x0000FFFF;
++
++ gpio->GPFCON = 0x0000AAAA;
++ gpio->GPFUP = 0x000000FF;
++
++ gpio->GPGCON = 0x01AAFE79;
++ gpio->GPGUP = 0x0000FFFF;
++
++ gpio->GPHCON = 0x001AAAAA;
++ gpio->GPHUP = 0x000007FF;
++
++ gpio->GPJCON = 0x1551544;
++ gpio->GPJUP = 0x1ffff;
++ gpio->GPJDAT |= (1 << 4); /* Set GPJ4 to high (nGSM_EN) */
+#else
+#error Please define GTA02 version
+#endif
@@ -276,15 +304,15 @@
+
+#if defined(CONFIG_ARCH_GTA02_v1)
+ /* Glamo3362 reset and power cycle */
-+ gpio->GPJDAT &= ~0x000000001;
++ gpio->GPJDAT &= ~0x000000001; /* GTA02v1_GPIO_3D_RESET */
+ pcf50633_reg_write(PCF50633_REG_DOWN2ENA, 0);
+ udelay(50*1000);
+ pcf50633_reg_write(PCF50633_REG_DOWN2ENA, 0x2);
-+ gpio->GPJDAT |= 0x000000001;
-+#elif defined(CONFIG_ARCH_GTA02_v2)
-+ gpio->GPJDAT &= ~(1 << 5);
++ gpio->GPJDAT |= 0x000000001; /* GTA02v1_GPIO_3D_RESET */
++#else
++ gpio->GPJDAT &= ~(1 << 5); /* GTA02_GPIO_3D_RESET */
+ udelay(50*1000);
-+ gpio->GPJDAT |= (1 << 5);
++ gpio->GPJDAT |= (1 << 5); /* GTA02_GPIO_3D_RESET */
+#endif
+
+#if 0
@@ -381,6 +409,10 @@
+ return 0x00000310;
+#elif defined(CONFIG_ARCH_GTA02_v2)
+ return 0x00000320;
++#elif defined(CONFIG_ARCH_GTA02_v3)
++ return 0x00000330;
++#elif defined(CONFIG_ARCH_GTA02_v4)
++ return 0x00000340;
+#endif
+}
+
@@ -410,8 +442,7 @@
+ gpio->GPGDAT |= (1 << 11); /* GPG11 */
+#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
+ gpio->GPBDAT |= (1 << 10); /* GPB10 */
-+#elif defined(CONFIG_ARCH_GTA01B_v4) || defined(CONFIG_ARCH_GTA02_v1) || \
-+ defined(CONFIG_ARCH_GTA02_v2)
++#else
+ gpio->GPBDAT |= (1 << 3); /* GPB3 */
+#endif
+ else
@@ -419,8 +450,7 @@
+ gpio->GPGDAT &= ~(1 << 11); /* GPG11 */
+#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
+ gpio->GPBDAT &= ~(1 << 10); /* GPB10 */
-+#elif defined(CONFIG_ARCH_GTA01B_v4) || defined(CONFIG_ARCH_GTA02_v1) || \
-+ defined(CONFIG_ARCH_GTA02_v2)
++#else
+ gpio->GPBDAT &= ~(1 << 3); /* GPB3 */
+#endif
+}
@@ -434,10 +464,10 @@
+#if !defined(CONFIG_ARCH_GTA02_v1)
+ pcf50633_reg_write(PCF50633_REG_GPIO2CFG, 0x07);
+#endif
-+ gpio->GPBDAT &= ~(1 << 5);
-+ gpio->GPBDAT |= (1 << 7);
++ gpio->GPBDAT &= ~(1 << 5); /* GTA02_GPIO_MODEM_RST */
++ gpio->GPBDAT |= (1 << 7); /* GTA02_GPIO_MODEM_ON */
+ } else {
-+ gpio->GPBDAT &= ~(1 << 7);
++ gpio->GPBDAT &= ~(1 << 7); /* GTA02_GPIO_MODEM_ON */
+#if !defined(CONFIG_ARCH_GTA02_v1)
+ pcf50633_reg_write(PCF50633_REG_GPIO2CFG, 0x00);
+#endif
@@ -560,7 +590,7 @@
===================================================================
--- /dev/null
+++ u-boot/include/configs/neo1973_gta02.h
-@@ -0,0 +1,278 @@
+@@ -0,0 +1,284 @@
+/*
+ * (C) Copyright 2007 OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -692,6 +722,12 @@
+#elif defined(CONFIG_ARCH_GTA02_v2)
+#define CFG_PROMPT "GTA02v2 # " /* Monitor Command
Prompt */
+#define CONFIG_S3C2442 1 /* SAMSUNG S3C2442 SoC
*/
++#elif defined(CONFIG_ARCH_GTA02_v3)
++#define CFG_PROMPT "GTA02v3 # " /* Monitor Command
Prompt */
++#define CONFIG_S3C2442 1 /* SAMSUNG S3C2442 SoC
*/
++#elif defined(CONFIG_ARCH_GTA02_v4)
++#define CFG_PROMPT "GTA02v4 # " /* Monitor Command
Prompt */
++#define CONFIG_S3C2442 1 /* SAMSUNG S3C2442 SoC
*/
+#endif
+#define CFG_CBSIZE 256 /* Console I/O Buffer
Size */
+#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer
Size */
@@ -834,7 +870,7 @@
+#define CONFIG_RTC_PCF50633 1
+
+#define MTDIDS_DEFAULT "nand0=neo1973-nand"
-+#define MTPARTS_DEFAULT
"neo1973-nand:256k(u-boot),128k(u-boot_env),2M(kernel),640k(splash),-(jffs2)"
++#define MTPARTS_DEFAULT
"neo1973-nand:256k(u-boot),128k(u-boot_env),2M(kernel),640k(splash),-(rootfs)"
+#define CFG_NAND_DYNPART_MTD_KERNEL_NAME "neo1973-nand"
+#define CONFIG_NAND_DYNPART
+
@@ -843,13 +879,13 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/gta02/split_by_variant.sh
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,53 @@
+#!/bin/sh
+# ---------------------------------------------------------
+# Set the core module defines according to Core Module
+# ---------------------------------------------------------
+# ---------------------------------------------------------
-+# Set up the GTA01 type define
++# Set up the GTA03 type define
+# ---------------------------------------------------------
+
+CFGINC=${obj}include/config.h
@@ -873,10 +909,21 @@
+ echo "CONFIG_USB_DFU_REVISION=0x0320" > $CFGTMP
+ ;;
+
++ gta02v3_config)
++ echo "#define CONFIG_ARCH_GTA02_v3" > $CFGINC
++ echo "CONFIG_USB_DFU_REVISION=0x0330" > $CFGTMP
++ ;;
++
++ gta02v4_config)
++ echo "#define CONFIG_ARCH_GTA02_v4" > $CFGINC
++ echo "CONFIG_USB_DFU_REVISION=0x0340" > $CFGTMP
++ ;;
++
++
+ *)
-+ echo "$0:: Unrecognised config - using GTA02v1 config"
-+ echo "#define CONFIG_ARCH_GTA02_v1" > $CFGINC
-+ echo "CONFIG_USB_DFU_REVISION=0x0310" > $CFGTMP
++ echo "$0:: Unrecognised config - using GTA02v3 config"
++ echo "#define CONFIG_ARCH_GTA02_v3" > $CFGINC
++ echo "CONFIG_USB_DFU_REVISION=0x0330" > $CFGTMP
+ ;;
+
+ esac
@@ -1349,13 +1396,14 @@
#define B1_Tah 0x0 /* 0clk */
#define B1_Tacp 0x0
#define B1_PMC 0x0
-@@ -109,16 +109,18 @@
+@@ -109,16 +109,19 @@
#define B6_MT 0x3 /* SDRAM */
#define B6_Trcd 0x1 /* 3clk */
-#if defined (CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4)
+#if defined (CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4) || \
-+ defined(CONFIG_ARCH_GTA02_v2)
++ defined(CONFIG_ARCH_GTA02_v2) || defined(CONFIG_ARCH_GTA02_v3) || \
++ defined(CONFIG_ARCH_GTA02_v4)
#define B6_SCAN 0x1 /* 9bit */
+#define B7_SCAN 0x1 /* 9bit */
#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) || \
@@ -1371,7 +1419,7 @@
/* REFRESH parameter */
#define REFEN 0x1 /* Refresh enable */
-@@ -165,6 +167,27 @@
+@@ -165,6 +168,28 @@
str r1, [r0]
#endif
@@ -1385,7 +1433,8 @@
+ ldr r1, [r0, #0xd4] /* GPJDAT */
+ orr r1, r1, #(1 << 3)
+ str r1, [r0, #0xd4]
-+#elif defined(CONFIG_ARCH_GTA02_v2)
++#elif defined(CONFIG_ARCH_GTA02_v2) || defined(CONFIG_ARCH_GTA02_v3) || \
++ defined(CONFIG_ARCH_GTA02_v4)
+ /* enable KEEPACT(GPJ8) to make sure PMU keeps us alive */
+ ldr r0, =0x56000000 /* GPJ base */
+ ldr r1, [r0, #0xd0] /* GPJCON */
@@ -1399,11 +1448,12 @@
/* everything is fine now */
mov pc, lr
-@@ -182,6 +205,10 @@
+@@ -182,6 +207,11 @@
.word ((B6_MT<<15)+(B6_Trcd<<2)+(B6_SCAN))
.word ((B7_MT<<15)+(B7_Trcd<<2)+(B7_SCAN))
.word ((REFEN<<23)+(TREFMD<<22)+(Trp<<20)+(Trc<<18)+(Tchr<<16)+REFCNT)
-+#if defined(CONFIG_ARCH_GTA02_v2)
++#if defined(CONFIG_ARCH_GTA02_v2) || defined(CONFIG_ARCH_GTA02_v3) || \
++ defined(CONFIG_ARCH_GTA02_v4)
+ .word 0xb1
+#else
.word 0xb2
@@ -1782,7 +1832,7 @@
===================================================================
--- u-boot.orig/common/cmd_nand.c
+++ u-boot/common/cmd_nand.c
-@@ -200,8 +200,10 @@
+@@ -204,8 +204,10 @@
putc('\n');
for (i = 0; i < CFG_MAX_NAND_DEVICE; i++) {
if (nand_info[i].name)
@@ -1819,21 +1869,23 @@
void udc_ctrl(enum usbd_event event, int param)
{
-@@ -11,7 +12,8 @@
+@@ -11,7 +12,9 @@
switch (event) {
case UDC_CTRL_PULLUP_ENABLE:
#if defined(CONFIG_ARCH_GTA01_v4) || defined(CONFIG_ARCH_GTA01B_v2) || \
- defined(CONFIG_ARCH_GTA01B_v3) || defined(CONFIG_ARCH_GTA01B_v4)
+ defined(CONFIG_ARCH_GTA01B_v3) || defined(CONFIG_ARCH_GTA01B_v4) || \
-+ defined(CONFIG_ARCH_GTA02_v1) || defined(CONFIG_ARCH_GTA02_v2)
++ defined(CONFIG_ARCH_GTA02_v1) || defined(CONFIG_ARCH_GTA02_v2) || \
++ defined(CONFIG_ARCH_GTA02_v3) || defined(CONFIG_ARCH_GTA02_v4)
if (param)
gpio->GPBDAT |= (1 << 9);
else
-@@ -23,6 +25,11 @@
+@@ -23,6 +26,12 @@
defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) || \
defined(CONFIG_ARCH_GTA01B_v4)
pcf50606_charge_autofast(param);
-+#elif defined(CONFIG_ARCH_GTA02_v1) || defined(CONFIG_ARCH_GTA02_v2)
++#elif defined(CONFIG_ARCH_GTA02_v1) || defined(CONFIG_ARCH_GTA02_v2) || \
++ defined(CONFIG_ARCH_GTA02_v3) || defined(CONFIG_ARCH_GTA02_v4)
+ if (param)
+ pcf50633_usb_maxcurrent(500);
+ else
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-14 15:10:33 +0200 (Sun, 14 Oct 2007)
New Revision: 3161
Added:
trunk/doc/hardware/GTA02v4/
Modified:
trunk/doc/hardware/GTA02v4/gpio.txt
Log:
add GTA02v4 GPIO definitions
Copied: trunk/doc/hardware/GTA02v4 (from rev 3148, trunk/doc/hardware/GTA02v3)
Modified: trunk/doc/hardware/GTA02v4/gpio.txt
===================================================================
--- trunk/doc/hardware/GTA02v3/gpio.txt 2007-10-12 09:14:48 UTC (rev 3148)
+++ trunk/doc/hardware/GTA02v4/gpio.txt 2007-10-14 13:10:33 UTC (rev 3161)
@@ -1,4 +1,4 @@
-S3C2442B43 - as of schematics GTA02_MB_A3_0906
+S3C2442B54 - as of schematics GTA02_MB_A4_0914
GPA0 O ADDR0 NC
GPA1 O ADDR16
@@ -13,8 +13,8 @@
GPA10 O ADDR25
GPA11 O ADDR26 NC
GPA12 O nGCS1 n3D_CS
-GPA13 O GPA13 nDL_GSM
-GPA14 O GPA14 NC
+GPA13 O GPA13 NC
+GPA14 O nGCS3 nGCS3 NOR CS
GPA15 O GPA15 H-TP1516
GPA16 O GPA16 NC
GPA17 O CLE NAND_CLE NAND
@@ -24,7 +24,7 @@
GPA21 O nRSTOUT NC
GPA22 O nFCE nNAND_CS0 NAND
-GPACON = 111 1110 0001 1111 1111 1111 = 0x7e1fff
+GPACON = 111 1110 0101 1111 1111 1111 = 0x7e5fff
GPB0 O TOUT0 LED1501
@@ -109,7 +109,7 @@
GPF1 I EINT1 IO1
GPF2 I EINT2 PIO_2 bluetooth wakeup GPIO
GPF3 I EINT3 EINT3 debug port
-GPF4 I EINT4 JACK_INSERT headphone jack
+GPF4 I EINT4 nJACK_INSERT headphone jack
GPF5 I EINT5 WLAN_GPIO1 wlan wakeup GPIO
GPF6 I EINT6 AUX aux button
GPF7 I EINT7 nHOLD headset
@@ -161,7 +161,7 @@
GPJ3 O GPJ3 INT0 GSM
GPJ4 O GPJ4 nGSM_EN
GPJ5 O GPJ5 n3D_RST
-GPJ6 O GPJ6 NC
+GPJ6 O GPJ6 nDL_GSM GSM
GPJ7 I GPJ7 WLAN_GPIO0
GPJ8 O GPJ8 KEEPACT
GPJ9 O GPJ9 NC
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-14 19:52:31 +0200 (Sun, 14 Oct 2007)
New Revision: 3162
Modified:
trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
trunk/src/target/u-boot/patches/uboot-s3c2440.patch
trunk/src/target/u-boot/patches/uboot-s3c2442.patch
trunk/src/target/u-boot/patches/uboot-s3c2443.patch
Log:
re-sync our start.S changes with mainline u-boot
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-10-14
13:10:33 UTC (rev 3161)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-10-14
17:52:31 UTC (rev 3162)
@@ -368,18 +368,18 @@
#include <config.h>
#include <version.h>
+#include <s3c2410.h>
- #if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) ||
defined(CONFIG_AT91RM9200DF)
- #include <led.h>
- #endif
-@@ -246,6 +251,7 @@
- #endif /* CONFIG_BOOTBINFUNC */
- #else
+ #include <status_led.h>
+
+ /*
+@@ -181,6 +186,7 @@
+ #ifdef CONFIG_AT91RM9200
+
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
+#ifndef CONFIG_S3C2410_NAND_BOOT
relocate: /* relocate U-Boot to RAM */
adr r0, _start /* r0 <- current position of code */
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
-@@ -262,6 +268,93 @@
+@@ -197,6 +203,93 @@
stmia r1!, {r3-r10} /* copy to target address [r1] */
cmp r0, r2 /* until source end addreee [r2] */
ble copy_loop
Modified: trunk/src/target/u-boot/patches/uboot-s3c2440.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2440.patch 2007-10-14 13:10:33 UTC
(rev 3161)
+++ trunk/src/target/u-boot/patches/uboot-s3c2440.patch 2007-10-14 17:52:31 UTC
(rev 3162)
@@ -756,22 +756,29 @@
+#elif defined(CONFIG_S3C2440)
+#include <s3c2440.h>
+#endif
- #if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) ||
defined(CONFIG_AT91RM9200DF)
- #include <led.h>
+ #include <status_led.h>
+
+ /*
+@@ -154,20 +158,38 @@
+ bne copyex
#endif
-@@ -207,14 +211,32 @@
- # define pWTCON 0x15300000
- # define INTMSK 0x14400008 /* Interupt-Controller base
addresses */
- # define CLKDIVN 0x14800014 /* clock divisor register */
--#elif defined(CONFIG_S3C2410)
-+#elif defined(CONFIG_S3C2410) || defined (CONFIG_S3C2440)
- # define pWTCON 0x53000000
- # define INTMSK 0x4A000008 /* Interupt-Controller base
addresses */
- # define INTSUBMSK 0x4A00001C
- # define CLKDIVN 0x4C000014 /* clock divisor register */
- #endif
-#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
++#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) ||
defined(CONFIG_S3C2440)
+ /* turn off the watchdog */
+
+ # if defined(CONFIG_S3C2400)
+ # define pWTCON 0x15300000
+ # define INTMSK 0x14400008 /* Interupt-Controller base
addresses */
+ # define CLKDIVN 0x14800014 /* clock divisor register */
+-#else
++#elif defined(CONFIG_S3C2410) || defined(CONFIG_S3C2440)
+ # define pWTCON 0x53000000
+ # define INTMSK 0x4A000008 /* Interupt-Controller base
addresses */
+ # define INTSUBMSK 0x4A00001C
+ # define CLKDIVN 0x4C000014 /* clock divisor register */
+ # endif
+
+#if defined(CONFIG_S3C2410)
+# define INTSUBMSK_val 0x7ff
+# define MPLLCON_val ((0x90 << 12) + (0x7 << 4) + 0x0) /* 202 MHz */
@@ -790,11 +797,10 @@
+# define CAMDIVN 0x4C000018
+#endif
+
-+#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) ||
defined(CONFIG_S3C2440)
ldr r0, =pWTCON
mov r1, #0x0
str r1, [r0]
-@@ -225,24 +247,34 @@
+@@ -178,24 +200,34 @@
mov r1, #0xffffffff
ldr r0, =INTMSK
str r1, [r0]
@@ -836,7 +842,7 @@
str r1, [r0]
/* Page 7-19, seven nops between UPLL and MPLL */
-@@ -254,12 +286,12 @@
+@@ -207,12 +239,12 @@
nop
nop
@@ -851,7 +857,7 @@
str r1, [r0]
#if 1
-@@ -287,7 +319,7 @@
+@@ -240,7 +272,7 @@
str r1, [r0, #0x28]
#endif
@@ -860,7 +866,7 @@
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
#ifndef CONFIG_LL_INIT_NAND_ONLY
-@@ -364,7 +396,7 @@
+@@ -299,7 +331,7 @@
#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && defined(CONFIG_LL_INIT_NAND_ONLY)
bl cpu_init_crit
#endif
@@ -869,7 +875,7 @@
/* ensure some refresh has happened */
ldr r1, =0xfffff
1: subs r1, r1, #1
-@@ -375,11 +407,12 @@
+@@ -310,11 +342,12 @@
ldr r0, [ r1 ]
tst r0, #0x02 /* is this resume from power down */
ldrne pc, [r1, #4] /* gstatus3 */
@@ -883,7 +889,7 @@
@ reset NAND
mov r1, #S3C2410_NAND_BASE
ldr r2, =0xf842 @ initial value enable
tacls=3,rph0=6,rph1=0
-@@ -399,6 +432,17 @@
+@@ -334,6 +367,17 @@
ldr r2, [r1, #oNFCONF]
orr r2, r2, #0x800 @ disable chip
str r2, [r1, #oNFCONF]
@@ -901,7 +907,7 @@
#if 0
@ get ready to call C functions (for nand_read())
-@@ -467,7 +511,7 @@
+@@ -402,7 +446,7 @@
#endif /* CONFIG_S3C2410_NAND_BOOT */
done_relocate:
Modified: trunk/src/target/u-boot/patches/uboot-s3c2442.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2442.patch 2007-10-14 13:10:33 UTC
(rev 3161)
+++ trunk/src/target/u-boot/patches/uboot-s3c2442.patch 2007-10-14 17:52:31 UTC
(rev 3162)
@@ -391,40 +391,44 @@
+#elif defined(CONFIG_S3C2440) || defined(CONFIG_S3C2442)
#include <s3c2440.h>
#endif
- #if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) ||
defined(CONFIG_AT91RM9200DF)
-@@ -211,7 +211,7 @@
- # define pWTCON 0x15300000
- # define INTMSK 0x14400008 /* Interupt-Controller base
addresses */
- # define CLKDIVN 0x14800014 /* clock divisor register */
--#elif defined(CONFIG_S3C2410) || defined (CONFIG_S3C2440)
-+#elif defined(CONFIG_S3C2410) || defined (CONFIG_S3C2440) ||
defined(CONFIG_S3C2442)
- # define pWTCON 0x53000000
- # define INTMSK 0x4A000008 /* Interupt-Controller base
addresses */
- # define INTSUBMSK 0x4A00001C
-@@ -234,9 +234,21 @@
+ #include <status_led.h>
+@@ -158,14 +158,15 @@
+ bne copyex
#endif
+
+-#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) ||
defined(CONFIG_S3C2440)
++#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) ||
defined(CONFIG_S3C2440) || \
++ defined(CONFOG_S3C2442)
+ /* turn off the watchdog */
+
+ # if defined(CONFIG_S3C2400)
+ # define pWTCON 0x15300000
+ # define INTMSK 0x14400008 /* Interupt-Controller base
addresses */
+ # define CLKDIVN 0x14800014 /* clock divisor register */
+-#elif defined(CONFIG_S3C2410) || defined(CONFIG_S3C2440)
++#elif defined(CONFIG_S3C2410) || defined(CONFIG_S3C2440) ||
defined(CONFIG_S3C2442)
+ # define pWTCON 0x53000000
+ # define INTMSK 0x4A000008 /* Interupt-Controller base
addresses */
+ # define INTSUBMSK 0x4A00001C
+@@ -188,6 +189,17 @@
+ #endif
# define CLKDIVN_val 7 /* FCLK:HCLK:PCLK = 1:3:6 */
# define CAMDIVN 0x4C000018
+#elif defined(CONFIG_S3C2442)
-+# define INTSUBMSK_val 0xffff
++# define INTSUBMSK_val 0xffff
+# if (CONFIG_SYS_CLK_FREQ == 12000000)
-+# define MPLLCON_val ((142 << 12) + (7 << 4) + 1)
++# define MPLLCON_val ((142 << 12) + (7 << 4) + 1)
+# define UPLLCON_val (( 88 << 12) + (8 << 4) + 2)
+# elif (CONFIG_SYS_CLK_FREQ == 16934400)
+# define MPLLCON_val ((181 << 12) + (14<< 4) + 1)
+# define UPLLCON_val (( 26 << 12) + (4 << 4) + 1)
+# endif
-+# define CLKDIVN_val 7 /* FCLK:HCLK:PCLK = 1:3:6 */
-+# define CAMDIVN 0x4C000018
++# define CLKDIVN_val 7 /* FCLK:HCLK:PCLK = 1:3:6 */
++# define CAMDIVN 0x4C000018
#endif
--#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) ||
defined(CONFIG_S3C2440)
-+#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) ||
defined(CONFIG_S3C2440) || \
-+ defined(CONFIG_S3C2442)
ldr r0, =pWTCON
- mov r1, #0x0
- str r1, [r0]
-@@ -247,13 +259,13 @@
+@@ -200,13 +212,13 @@
mov r1, #0xffffffff
ldr r0, =INTMSK
str r1, [r0]
@@ -440,7 +444,7 @@
/* Make sure we get FCLK:HCLK:PCLK = 1:3:6 */
ldr r0, =CAMDIVN
mov r1, #0
-@@ -319,7 +331,7 @@
+@@ -272,7 +284,7 @@
str r1, [r0, #0x28]
#endif
@@ -449,7 +453,7 @@
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
#ifndef CONFIG_LL_INIT_NAND_ONLY
-@@ -396,7 +408,7 @@
+@@ -331,7 +343,7 @@
#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && defined(CONFIG_LL_INIT_NAND_ONLY)
bl cpu_init_crit
#endif
@@ -458,7 +462,7 @@
/* ensure some refresh has happened */
ldr r1, =0xfffff
1: subs r1, r1, #1
-@@ -407,7 +419,7 @@
+@@ -342,7 +354,7 @@
ldr r0, [ r1 ]
tst r0, #0x02 /* is this resume from power down */
ldrne pc, [r1, #4] /* gstatus3 */
@@ -467,7 +471,7 @@
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
/* mov r10, lr */
-@@ -432,7 +444,7 @@
+@@ -367,7 +379,7 @@
ldr r2, [r1, #oNFCONF]
orr r2, r2, #0x800 @ disable chip
str r2, [r1, #oNFCONF]
@@ -476,7 +480,7 @@
mov r1, #S3C2440_NAND_BASE
ldr r2, =0xfff0 @ initial value tacls=3,rph0=7,rph1=7
ldr r3, [r1, #oNFCONF]
-@@ -511,7 +523,8 @@
+@@ -446,7 +458,8 @@
#endif /* CONFIG_S3C2410_NAND_BOOT */
done_relocate:
Modified: trunk/src/target/u-boot/patches/uboot-s3c2443.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2443.patch 2007-10-14 13:10:33 UTC
(rev 3161)
+++ trunk/src/target/u-boot/patches/uboot-s3c2443.patch 2007-10-14 17:52:31 UTC
(rev 3162)
@@ -9,26 +9,30 @@
+#elif defined(CONFIG_S3C2443)
+#include <s3c2443.h>
#endif
- #if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) ||
defined(CONFIG_AT91RM9200DF)
- #include <led.h>
-@@ -245,10 +247,15 @@
+ #include <status_led.h>
+
+@@ -159,7 +161,7 @@
+ #endif
+
+ #if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) ||
defined(CONFIG_S3C2440) || \
+- defined(CONFOG_S3C2442)
++ defined(CONFOG_S3C2442) || defined(CONFIG_S3C2443)
+ /* turn off the watchdog */
+
+ # if defined(CONFIG_S3C2400)
+@@ -200,6 +202,11 @@
# endif
- # define CLKDIVN_val 7 /* FCLK:HCLK:PCLK = 1:3:6 */
- # define CAMDIVN 0x4C000018
+ # define CLKDIVN_val 7 /* FCLK:HCLK:PCLK = 1:3:6 */
+ # define CAMDIVN 0x4C000018
+#elif defined(CONFIG_S3C2443)
-+# define INTSUBMSK_val 0x1fffffff
++# define INTSUBMSK_val 0x1fffffff
+# define EPLLCON_val ((40 << 16) | (1 << 8) | (1)) /* 96 MHz */
+# define MPLLCON_val ((81 << 16) | (2 << 8) | (0)) /* 1068 MHz */
+# define CLKDIV0_val ((8 << 9) | (1 << 4) | (1 << 3) | (1 << 2)
#endif
- #if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) ||
defined(CONFIG_S3C2440) || \
-- defined(CONFIG_S3C2442)
-+ defined(CONFIG_S3C2442) || defined(CONFIG_S3c2443)
ldr r0, =pWTCON
- mov r1, #0x0
- str r1, [r0]
-@@ -259,7 +266,8 @@
+@@ -212,7 +219,8 @@
mov r1, #0xffffffff
ldr r0, =INTMSK
str r1, [r0]
@@ -38,7 +42,7 @@
ldr r1, =INTSUBMSK_val
ldr r0, =INTSUBMSK
str r1, [r0]
-@@ -278,6 +286,43 @@
+@@ -231,6 +239,43 @@
mcr p15, 0, r1, c1, c0, 0
@@ -82,7 +86,7 @@
#define LOCKTIME 0x4c000000
#define UPLLCON 0x4c000008
-@@ -305,6 +350,7 @@
+@@ -258,6 +303,7 @@
ldr r0, =CLKDIVN
mov r1, #CLKDIVN_val
str r1, [r0]
@@ -90,7 +94,7 @@
#if 1
/* enable uart */
-@@ -331,7 +377,8 @@
+@@ -284,7 +330,8 @@
str r1, [r0, #0x28]
#endif
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-15 07:54:20 +0200 (Mon, 15 Oct 2007)
New Revision: 3163
Added:
trunk/src/target/u-boot/patches/uboot-s3c2410-nand-led.patch
Modified:
trunk/src/target/u-boot/patches/series
trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
trunk/src/target/u-boot/patches/uboot-s3c2440.patch
trunk/src/target/u-boot/patches/uboot-s3c2442.patch
trunk/src/target/u-boot/patches/uboot-s3c2443.patch
Log:
re-sync with mainline u-boot start.S changes
* correctly boot from NAND (conflict intoruced by AT91RM9200 changes)
* don't call the LED code in lib_arm/board.o since it is not part of
the steppingstone
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2007-10-14 17:52:31 UTC (rev
3162)
+++ trunk/src/target/u-boot/patches/series 2007-10-15 05:54:20 UTC (rev
3163)
@@ -10,6 +10,7 @@
uboot-arm920t-gd_in_irq.patch
uboot-arm920_s3c2410_irq_demux.patch
uboot-s3c2410-nand.patch
+uboot-s3c2410-nand-led.patch
uboot-cmd_s3c2410.patch
uboot-s3c2410-mmc.patch
uboot-s3c24xx_multi_serial.patch
Added: trunk/src/target/u-boot/patches/uboot-s3c2410-nand-led.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-nand-led.patch
2007-10-14 17:52:31 UTC (rev 3162)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-nand-led.patch
2007-10-15 05:54:20 UTC (rev 3163)
@@ -0,0 +1,23 @@
+If we boot from the S3C24xx NAND, then we only have access to the
+first 4kByte of memory. Thus, te coloured_LED_init and red_LED_on
+functions defined in lib_arm/board.o cannot be referenced at this
+point.
+
+Index: u-boot/cpu/arm920t/start.S
+===================================================================
+--- u-boot.orig/cpu/arm920t/start.S
++++ u-boot/cpu/arm920t/start.S
+@@ -141,8 +141,13 @@
+ orr r0,r0,#0xd3
+ msr cpsr,r0
+
++ /* in case we run from the s3c24xx NAND stepping stone, the symbols
++ * for LED support are in lib_arm/board.o, i.e. outside of the
++ * steppingstone */
++#ifndef CONFIG_S3C2410_NAND_BOOT
+ bl coloured_LED_init
+ bl red_LED_on
++#endif
+
+ #if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) ||
defined(CONFIG_AT91RM9200DF)
+ /*
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-10-14
17:52:31 UTC (rev 3162)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-10-15
05:54:20 UTC (rev 3163)
@@ -371,9 +371,13 @@
#include <status_led.h>
/*
-@@ -181,6 +186,7 @@
- #ifdef CONFIG_AT91RM9200
+@@ -178,9 +183,10 @@
+ bl cpu_init_crit
+ #endif
+-#ifdef CONFIG_AT91RM9200
++#if defined(CONFIG_AT91RM9200) || defined(CONFIG_S3C2410)
+
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
+#ifndef CONFIG_S3C2410_NAND_BOOT
relocate: /* relocate U-Boot to RAM */
Modified: trunk/src/target/u-boot/patches/uboot-s3c2440.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2440.patch 2007-10-14 17:52:31 UTC
(rev 3162)
+++ trunk/src/target/u-boot/patches/uboot-s3c2440.patch 2007-10-15 05:54:20 UTC
(rev 3163)
@@ -857,7 +857,7 @@
str r1, [r0]
#if 1
-@@ -240,7 +272,7 @@
+@@ -240,14 +272,15 @@
str r1, [r0, #0x28]
#endif
@@ -866,7 +866,16 @@
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
#ifndef CONFIG_LL_INIT_NAND_ONLY
-@@ -299,7 +331,7 @@
+ bl cpu_init_crit
+ #endif
+
+-#if defined(CONFIG_AT91RM9200) || defined(CONFIG_S3C2410)
++#if defined(CONFIG_AT91RM9200) || defined(CONFIG_S3C2410) || \
++ defined(CONFIG_S3C2440)
+
+ #ifndef CONFIG_SKIP_RELOCATE_UBOOT
+ adr r0, _start /* r0 <- current position of code */
+@@ -299,7 +332,7 @@
#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && defined(CONFIG_LL_INIT_NAND_ONLY)
bl cpu_init_crit
#endif
@@ -875,7 +884,7 @@
/* ensure some refresh has happened */
ldr r1, =0xfffff
1: subs r1, r1, #1
-@@ -310,11 +342,12 @@
+@@ -310,11 +343,12 @@
ldr r0, [ r1 ]
tst r0, #0x02 /* is this resume from power down */
ldrne pc, [r1, #4] /* gstatus3 */
@@ -889,7 +898,7 @@
@ reset NAND
mov r1, #S3C2410_NAND_BASE
ldr r2, =0xf842 @ initial value enable
tacls=3,rph0=6,rph1=0
-@@ -334,6 +367,17 @@
+@@ -334,6 +368,17 @@
ldr r2, [r1, #oNFCONF]
orr r2, r2, #0x800 @ disable chip
str r2, [r1, #oNFCONF]
@@ -907,7 +916,7 @@
#if 0
@ get ready to call C functions (for nand_read())
-@@ -402,7 +446,7 @@
+@@ -402,7 +447,7 @@
#endif /* CONFIG_S3C2410_NAND_BOOT */
done_relocate:
Modified: trunk/src/target/u-boot/patches/uboot-s3c2442.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2442.patch 2007-10-14 17:52:31 UTC
(rev 3162)
+++ trunk/src/target/u-boot/patches/uboot-s3c2442.patch 2007-10-15 05:54:20 UTC
(rev 3163)
@@ -453,7 +453,16 @@
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
#ifndef CONFIG_LL_INIT_NAND_ONLY
-@@ -331,7 +343,7 @@
+@@ -280,7 +292,7 @@
+ #endif
+
+ #if defined(CONFIG_AT91RM9200) || defined(CONFIG_S3C2410) || \
+- defined(CONFIG_S3C2440)
++ defined(CONFIG_S3C2440) || defined(CONFIG_S3C2442)
+
+ #ifndef CONFIG_SKIP_RELOCATE_UBOOT
+ adr r0, _start /* r0 <- current position of code */
+@@ -332,7 +344,7 @@
#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && defined(CONFIG_LL_INIT_NAND_ONLY)
bl cpu_init_crit
#endif
@@ -462,7 +471,7 @@
/* ensure some refresh has happened */
ldr r1, =0xfffff
1: subs r1, r1, #1
-@@ -342,7 +354,7 @@
+@@ -343,7 +355,7 @@
ldr r0, [ r1 ]
tst r0, #0x02 /* is this resume from power down */
ldrne pc, [r1, #4] /* gstatus3 */
@@ -471,7 +480,7 @@
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
/* mov r10, lr */
-@@ -367,7 +379,7 @@
+@@ -368,7 +380,7 @@
ldr r2, [r1, #oNFCONF]
orr r2, r2, #0x800 @ disable chip
str r2, [r1, #oNFCONF]
@@ -480,7 +489,7 @@
mov r1, #S3C2440_NAND_BASE
ldr r2, =0xfff0 @ initial value tacls=3,rph0=7,rph1=7
ldr r3, [r1, #oNFCONF]
-@@ -446,7 +458,8 @@
+@@ -447,7 +459,8 @@
#endif /* CONFIG_S3C2410_NAND_BOOT */
done_relocate:
Modified: trunk/src/target/u-boot/patches/uboot-s3c2443.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2443.patch 2007-10-14 17:52:31 UTC
(rev 3162)
+++ trunk/src/target/u-boot/patches/uboot-s3c2443.patch 2007-10-15 05:54:20 UTC
(rev 3163)
@@ -11,7 +11,7 @@
#endif
#include <status_led.h>
-@@ -159,7 +161,7 @@
+@@ -164,7 +166,7 @@
#endif
#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) ||
defined(CONFIG_S3C2440) || \
@@ -20,7 +20,7 @@
/* turn off the watchdog */
# if defined(CONFIG_S3C2400)
-@@ -200,6 +202,11 @@
+@@ -205,6 +207,11 @@
# endif
# define CLKDIVN_val 7 /* FCLK:HCLK:PCLK = 1:3:6 */
# define CAMDIVN 0x4C000018
@@ -32,7 +32,7 @@
#endif
ldr r0, =pWTCON
-@@ -212,7 +219,8 @@
+@@ -217,7 +224,8 @@
mov r1, #0xffffffff
ldr r0, =INTMSK
str r1, [r0]
@@ -42,7 +42,7 @@
ldr r1, =INTSUBMSK_val
ldr r0, =INTSUBMSK
str r1, [r0]
-@@ -231,6 +239,43 @@
+@@ -236,6 +244,43 @@
mcr p15, 0, r1, c1, c0, 0
@@ -86,7 +86,7 @@
#define LOCKTIME 0x4c000000
#define UPLLCON 0x4c000008
-@@ -258,6 +303,7 @@
+@@ -263,6 +308,7 @@
ldr r0, =CLKDIVN
mov r1, #CLKDIVN_val
str r1, [r0]
@@ -94,7 +94,7 @@
#if 1
/* enable uart */
-@@ -284,7 +330,8 @@
+@@ -289,7 +335,8 @@
str r1, [r0, #0x28]
#endif
@@ -104,6 +104,16 @@
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
#ifndef CONFIG_LL_INIT_NAND_ONLY
+@@ -297,7 +344,8 @@
+ #endif
+
+ #if defined(CONFIG_AT91RM9200) || defined(CONFIG_S3C2410) || \
+- defined(CONFIG_S3C2440) || defined(CONFIG_S3C2442)
++ defined(CONFIG_S3C2440) || defined(CONFIG_S3C2442) || \
++ defined(CONFIG_S3C2443)
+
+ #ifndef CONFIG_SKIP_RELOCATE_UBOOT
+ adr r0, _start /* r0 <- current position of code */
Index: u-boot/cpu/arm920t/s3c24x0/interrupts.c
===================================================================
--- u-boot.orig/cpu/arm920t/s3c24x0/interrupts.c
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
