[Balloon-svn] r1208 - in balloon/branches/menuconfig/kernel:…

Top Page
This message is part of the following thread:
Mthe complete thread tree sorted by date
 
 
Attachments:
Message as email
+ (text/plain)
Delete this message
Reply to this message
Author: subversion@balloonboard.org
Date:  
To: balloon-svn
Subject: [Balloon-svn] r1208 - in balloon/branches/menuconfig/kernel: . 2.6.34 2.6.36-rc1
Author: nick
Date: 2010-08-23 00:52:48 +0100 (Mon, 23 Aug 2010)
New Revision: 1208

Modified:
balloon/branches/menuconfig/kernel/2.6.34/balloon3.patch
balloon/branches/menuconfig/kernel/2.6.36-rc1/balloon3-nand.patch
balloon/branches/menuconfig/kernel/2.6.36-rc1/balloon3.patch
balloon/branches/menuconfig/kernel/2.6.36-rc1/series-CUED
balloon/branches/menuconfig/kernel/Makefile
Log:
add git checkout for yaffs2, update 2.6.36-rc1 CUED implementation. Initrd kernel confirmed as working so far 

Modified: balloon/branches/menuconfig/kernel/2.6.34/balloon3.patch
===================================================================
--- balloon/branches/menuconfig/kernel/2.6.34/balloon3.patch    2010-08-22 23:51:21 UTC (rev 1207)
+++ balloon/branches/menuconfig/kernel/2.6.34/balloon3.patch    2010-08-22 23:52:48 UTC (rev 1208)
@@ -1,7 +1,7 @@
 Index: linux-2.6.34/arch/arm/Kconfig
 ===================================================================
---- linux-2.6.34.orig/arch/arm/Kconfig    2010-05-23 11:04:57.000000000 +0100
-+++ linux-2.6.34/arch/arm/Kconfig    2010-05-23 11:05:04.000000000 +0100
+--- linux-2.6.34.orig/arch/arm/Kconfig    2010-08-01 18:45:41.000000000 +0100
++++ linux-2.6.34/arch/arm/Kconfig    2010-08-01 18:45:48.000000000 +0100
 @@ -1293,7 +1293,8 @@
             ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
             ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
@@ -14,8 +14,8 @@
        to provide useful information about your current system status.
 Index: linux-2.6.34/arch/arm/mach-pxa/balloon3.c
 ===================================================================
---- linux-2.6.34.orig/arch/arm/mach-pxa/balloon3.c    2010-05-23 11:04:57.000000000 +0100
-+++ linux-2.6.34/arch/arm/mach-pxa/balloon3.c    2010-05-23 11:07:04.000000000 +0100
+--- linux-2.6.34.orig/arch/arm/mach-pxa/balloon3.c    2010-08-01 18:45:41.000000000 +0100
++++ linux-2.6.34/arch/arm/mach-pxa/balloon3.c    2010-08-01 18:45:48.000000000 +0100
 @@ -25,6 +25,7 @@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
@@ -197,8 +197,8 @@
      .phys_io    = 0x40000000,
 Index: linux-2.6.34/arch/arm/mach-pxa/include/mach/balloon3.h
 ===================================================================
---- linux-2.6.34.orig/arch/arm/mach-pxa/include/mach/balloon3.h    2010-05-23 11:04:57.000000000 +0100
-+++ linux-2.6.34/arch/arm/mach-pxa/include/mach/balloon3.h    2010-05-23 11:05:04.000000000 +0100
+--- linux-2.6.34.orig/arch/arm/mach-pxa/include/mach/balloon3.h    2010-08-01 18:45:41.000000000 +0100
++++ linux-2.6.34/arch/arm/mach-pxa/include/mach/balloon3.h    2010-08-01 18:45:48.000000000 +0100
 @@ -27,19 +27,23 @@
  #define BALLOON3_FPGA_LENGTH    0x01000000


@@ -264,3 +264,32 @@ 

  #define BALLOON3_AUX_NIRQ    IRQ_GPIO(BALLOON3_GPIO_AUX_NIRQ)
  #define BALLOON3_CODEC_IRQ    IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ)
+Index: linux-2.6.34/arch/arm/mach-pxa/include/mach/memory.h
+===================================================================
+--- linux-2.6.34.orig/arch/arm/mach-pxa/include/mach/memory.h    2010-08-01 18:45:41.000000000 +0100
++++ linux-2.6.34/arch/arm/mach-pxa/include/mach/memory.h    2010-08-01 18:45:48.000000000 +0100
+@@ -39,5 +39,24 @@
+ #define ISA_DMA_THRESHOLD    (PHYS_OFFSET + SZ_64M - 1)
+ #define MAX_DMA_ADDRESS        (PAGE_OFFSET + SZ_64M)
+ #endif
++/*
++ * The Balloon3 board has 384 MB of RAM. This  * hack should be removed
++ * once the PHYS_OFFSET can be configured dynamically.
++ *
++ * The three 128MB SDRAM banks are at addresses 0xa0000000, 0xb0000000 and
++ * 0x80000000. The following code moves the block of SDRAM at 0x80000000 past
++ * the block at 0xb0000000 in virtual memory and vice versa. We use SparseMEM to
++ * map the pages properly.
++ */
++#ifdef    CONFIG_MACH_BALLOON3
++#define    MAX_PHYSMEM_BITS    32
++#define    SECTION_SIZE_BITS    29
++#define    __phys_to_virt(p) \
++    (((p) & 0x0fffffff) | \
++    (((p) & 0x10000000) ? 0x10000000 : (((p) & 0x20000000) ? 0x00000000 : 0x20000000)) | PAGE_OFFSET)
++#define    __virt_to_phys(v) \
++    (((v) & 0x0fffffff) | \
++    (((v) & 0x10000000) ? 0xb0000000 : (((v) & 0x20000000) ? 0x80000000 : 0xa0000000)))
++#endif
+ 
+ #endif


Modified: balloon/branches/menuconfig/kernel/2.6.36-rc1/balloon3-nand.patch
===================================================================
--- balloon/branches/menuconfig/kernel/2.6.36-rc1/balloon3-nand.patch    2010-08-22 23:51:21 UTC (rev 1207)
+++ balloon/branches/menuconfig/kernel/2.6.36-rc1/balloon3-nand.patch    2010-08-22 23:52:48 UTC (rev 1208)
@@ -6,8 +6,8 @@


 Index: drivers/mtd/nand/Makefile
 ===================================================================
---- drivers/mtd/nand/Makefile.orig    2010-08-22 22:21:59.000000000 +0100
-+++ drivers/mtd/nand/Makefile    2010-08-22 22:23:05.000000000 +0100
+--- drivers/mtd/nand/Makefile.orig    2010-08-16 01:41:37.000000000 +0100
++++ drivers/mtd/nand/Makefile    2010-08-22 22:52:57.000000000 +0100
 @@ -32,6 +32,7 @@
  obj-$(CONFIG_MTD_NAND_PXA3xx)        += pxa3xx_nand.o
  obj-$(CONFIG_MTD_NAND_TMIO)        += tmio_nand.o
@@ -18,8 +18,8 @@
  obj-$(CONFIG_MTD_NAND_ORION)        += orion_nand.o
 Index: drivers/mtd/nand/Kconfig
 ===================================================================
---- drivers/mtd/nand/Kconfig.orig    2010-08-22 22:21:59.000000000 +0100
-+++ drivers/mtd/nand/Kconfig    2010-08-22 22:23:05.000000000 +0100
+--- drivers/mtd/nand/Kconfig.orig    2010-08-16 01:41:37.000000000 +0100
++++ drivers/mtd/nand/Kconfig    2010-08-22 22:52:57.000000000 +0100
 @@ -425,6 +425,10 @@
        Support for NAND flash connected to a Toshiba Mobile IO
        Controller in some PDAs, including the Sharp SL6000x.
@@ -34,7 +34,7 @@
 Index: drivers/mtd/nand/balloon3.c
 ===================================================================
 --- /dev/null    1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mtd/nand/balloon3.c    2010-08-22 22:23:05.000000000 +0100
++++ drivers/mtd/nand/balloon3.c    2010-08-22 22:52:57.000000000 +0100
 @@ -0,0 +1,274 @@
 +/*
 + * linux/drivers/mtd/nand/balloon3.c
@@ -312,9 +312,9 @@
 +MODULE_DESCRIPTION("Device specific logic for NAND flash on Balloon3 board");
 Index: arch/arm/mach-pxa/include/mach/balloon3.h
 ===================================================================
---- arch/arm/mach-pxa/include/mach/balloon3.h.orig    2010-08-22 22:21:59.000000000 +0100
-+++ arch/arm/mach-pxa/include/mach/balloon3.h    2010-08-22 22:23:36.000000000 +0100
-@@ -103,6 +103,15 @@
+--- arch/arm/mach-pxa/include/mach/balloon3.h.orig    2010-08-16 01:41:37.000000000 +0100
++++ arch/arm/mach-pxa/include/mach/balloon3.h    2010-08-22 22:52:57.000000000 +0100
+@@ -86,6 +86,15 @@
  /* backlight control */
  #define BALLOON3_GPIO_RUN_BACKLIGHT    (99)


@@ -330,12 +330,3 @@
  #define BALLOON3_GPIO_S0_CD        (105)


/* NAND */
-@@ -112,7 +121,7 @@
- #define BALLOON3_GPIO_RUN_232 (22)
-
- /* NAND power */
--+#define BALLOON3_GPIO_RUN_NAND (102)
-+#define BALLOON3_GPIO_RUN_NAND (102)
-
- /* SAMOSA power */
- #define BALLOON3_GPIO_RUN_SAMOSA (101) 

Modified: balloon/branches/menuconfig/kernel/2.6.36-rc1/balloon3.patch
===================================================================
--- balloon/branches/menuconfig/kernel/2.6.36-rc1/balloon3.patch    2010-08-22 23:51:21 UTC (rev 1207)
+++ balloon/branches/menuconfig/kernel/2.6.36-rc1/balloon3.patch    2010-08-22 23:52:48 UTC (rev 1208)
@@ -1,7 +1,7 @@
 Index: linux-2.6.36-rc1/arch/arm/Kconfig
 ===================================================================
---- linux-2.6.36-rc1.orig/arch/arm/Kconfig    2010-08-22 18:06:12.000000000 +0100
-+++ linux-2.6.36-rc1/arch/arm/Kconfig    2010-08-22 18:06:20.000000000 +0100
+--- linux-2.6.36-rc1.orig/arch/arm/Kconfig    2010-08-22 23:16:04.000000000 +0100
++++ linux-2.6.36-rc1/arch/arm/Kconfig    2010-08-22 23:17:19.000000000 +0100
 @@ -1363,7 +1363,8 @@
             ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
             ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
@@ -14,8 +14,8 @@
        to provide useful information about your current system status.
 Index: linux-2.6.36-rc1/arch/arm/mach-pxa/balloon3.c
 ===================================================================
---- linux-2.6.36-rc1.orig/arch/arm/mach-pxa/balloon3.c    2010-08-22 18:06:13.000000000 +0100
-+++ linux-2.6.36-rc1/arch/arm/mach-pxa/balloon3.c    2010-08-22 18:53:54.000000000 +0100
+--- linux-2.6.36-rc1.orig/arch/arm/mach-pxa/balloon3.c    2010-08-22 23:16:04.000000000 +0100
++++ linux-2.6.36-rc1/arch/arm/mach-pxa/balloon3.c    2010-08-22 23:17:19.000000000 +0100
 @@ -26,6 +26,7 @@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
@@ -215,8 +215,8 @@
      .phys_io    = 0x40000000,
 Index: linux-2.6.36-rc1/arch/arm/mach-pxa/include/mach/memory.h
 ===================================================================
---- linux-2.6.36-rc1.orig/arch/arm/mach-pxa/include/mach/memory.h    2010-08-22 18:06:13.000000000 +0100
-+++ linux-2.6.36-rc1/arch/arm/mach-pxa/include/mach/memory.h    2010-08-22 18:06:20.000000000 +0100
+--- linux-2.6.36-rc1.orig/arch/arm/mach-pxa/include/mach/memory.h    2010-08-22 23:16:04.000000000 +0100
++++ linux-2.6.36-rc1/arch/arm/mach-pxa/include/mach/memory.h    2010-08-22 23:17:19.000000000 +0100
 @@ -26,5 +26,24 @@
  #define ISA_DMA_THRESHOLD    (PHYS_OFFSET + SZ_64M - 1)
  #define MAX_DMA_ADDRESS        (PAGE_OFFSET + SZ_64M)
@@ -242,3 +242,60 @@
 +#endif


  #endif
+Index: linux-2.6.36-rc1/arch/arm/mach-pxa/include/mach/balloon3.h
+===================================================================
+--- linux-2.6.36-rc1.orig/arch/arm/mach-pxa/include/mach/balloon3.h    2010-08-22 23:17:29.000000000 +0100
++++ linux-2.6.36-rc1/arch/arm/mach-pxa/include/mach/balloon3.h    2010-08-22 23:20:47.000000000 +0100
+@@ -45,6 +45,19 @@
+ #define BALLOON3_SAMOSA_ADDR_REG    (BALLOON3_FPGA_VIRT + 0x00c00000)
+ #define BALLOON3_SAMOSA_DATA_REG    (BALLOON3_FPGA_VIRT + 0x00c00004)
+ #define BALLOON3_SAMOSA_STATUS_REG    (BALLOON3_FPGA_VIRT + 0x00c0001c)
++#define BALLOON3_NANDIO_IO_REG        (BALLOON3_FPGA_VIRT + 0x00e00000)
++#define BALLOON3_CF_CONTROL_CLR_REG    (BALLOON3_FPGA_VIRT + 0x00e00008)
++#define BALLOON3_CF_STATUS_REG        (BALLOON3_FPGA_VIRT + 0x00e00008)
++#define BALLOON3_CF_CONTROL_SET_REG    (BALLOON3_FPGA_VIRT + 0x00e01008)
++#define BALLOON3_INT_CONTROL_CLR_REG    (BALLOON3_FPGA_VIRT + 0x00e0000C)
++#define BALLOON3_INT_CONTROL_REG    (BALLOON3_FPGA_VIRT + 0x00e0000C)
++#define BALLOON3_INT_CONTROL_SET_REG    (BALLOON3_FPGA_VIRT + 0x00e0100C)
++#define BALLOON3_NAND_CONTROL_CLR_REG    (BALLOON3_FPGA_VIRT + 0x00e00014)
++#define BALLOON3_NAND_STATUS_REG    (BALLOON3_FPGA_VIRT + 0x00e00014)
++#define BALLOON3_NAND_CONTROL_SET_REG     (BALLOON3_FPGA_VIRT + 0x00e01014)
++#define BALLOON3_GENERAL_CONTROL_CLR_REG (BALLOON3_FPGA_VIRT + 0x00e0001c)
++#define BALLOON3_VERSION_REG         (BALLOON3_FPGA_VIRT + 0x00e0001c)
++#define BALLOON3_GENERAL_CONTROL_SET_REG (BALLOON3_FPGA_VIRT + 0x00e0101c)
+ 
+ /* CF Status Register bits (read-only) bits */
+ #define BALLOON3_CF_nIRQ        (1 << 0)
+@@ -59,6 +72,8 @@
+ #define BALLOON3_BP_CF_NRDY_IRQ        BALLOON3_IRQ(0)
+ #define BALLOON3_BP_NSTSCHG_IRQ        BALLOON3_IRQ(1)
+ 
++#define BALLOON3_FPGA_IRQ    BALLOON3_IRQ(2)
++
+ /* NAND Control register */
+ #define    BALLOON3_NAND_CONTROL_FLWP    (1 << 7)
+ #define    BALLOON3_NAND_CONTROL_FLSE    (1 << 6)
+@@ -83,11 +98,23 @@
+ #define BALLOON3_GPIO_LED_NAND        (9)
+ #define BALLOON3_GPIO_LED_IDLE        (10)
+ 
++#define BALLOON3_GPIO_RUN_SPARTAN    (98)
++
+ /* backlight control */
+ #define BALLOON3_GPIO_RUN_BACKLIGHT    (99)
+ 
+ #define BALLOON3_GPIO_S0_CD        (105)
+ 
++/* serial transceiver control */
++#define BALLOON3_GPIO_RUN_232 (22)
++/* NAND power */
++#define BALLOON3_GPIO_RUN_NAND (102)
++/* SAMOSA power */
++#define BALLOON3_GPIO_RUN_SAMOSA (101)
++/* Parking */
++#define BALLOON3_NAND_PARKING      (1 << 5)
++#define BALLOON3_CF_SAMOSA_PARKING      (1 << 4)
++
+ /* NAND */
+ #define BALLOON3_GPIO_RUN_NAND        (102)
+ 


Modified: balloon/branches/menuconfig/kernel/2.6.36-rc1/series-CUED
===================================================================
--- balloon/branches/menuconfig/kernel/2.6.36-rc1/series-CUED    2010-08-22 23:51:21 UTC (rev 1207)
+++ balloon/branches/menuconfig/kernel/2.6.36-rc1/series-CUED    2010-08-22 23:52:48 UTC (rev 1208)
@@ -12,4 +12,3 @@
 #balloon3-gadget-suspend.patch
 #balloon3-gether-autoifupdown.patch
 yaffsconfig.patch -p0
-yaffsrootmode.patch


Modified: balloon/branches/menuconfig/kernel/Makefile
===================================================================
--- balloon/branches/menuconfig/kernel/Makefile    2010-08-22 23:51:21 UTC (rev 1207)
+++ balloon/branches/menuconfig/kernel/Makefile    2010-08-22 23:52:48 UTC (rev 1208)
@@ -171,7 +171,11 @@
     (( wget -N $(RELEASESITE)/sources/kernel/yaffs-$(YAFFSCHECKOUT).tar.bz2 && \
       tar --extract --bzip2 --file yaffs-$(YAFFSCHECKOUT).tar.bz2) || \
       ( echo "Checking out yaffs2 ($(YAFFSCHECKOUT)) from cvs"; \
-        CVSROOT=:pserver::/home/aleph1/cvs cvs export -f -D "$(YAFFSCHECKOUT)" yaffs2 || test $$? = 2 ) )) && \
+        CVSROOT=:pserver::/home/aleph1/cvs cvs export -f -D "$(YAFFSCHECKOUT)" yaffs2 \
+        || test $$? = 2 ) && \
+      ( echo "Checking out yaffs2 ($(YAFFSCHECKOUT)) from git"; \
+      git archive --format=tar --prefix=yaffs2/ --remote=git://www.aleph1.co.uk/yaffs2 master@{YAFFSCHECKOUT} | tar -x \
+        || test $$? = 2 ) )) && \
     ( cd $(RES)/yaffs2 && ./patch-ker.sh c ../linux-$(KERNVER) && \
     cd .. && tar -cjf $(RES)/yaffs-$(YAFFSCHECKOUT).tar.bz2 yaffs2 && rm -rf yaffs2) && \
     touch $(RES)/yaffs-source-$(YAFFSCHECKOUT).stamp



This message was posted to the following mailing lists:
Balloon-svn
Mailing List Info | Nearby Messages		<-[Balloon-svn] r1207 - balloon/branches/menuconfig[Balloon-svn] r1209 - balloon/branches/menuconfig/bootldr->
Stoneboat Mailing List Archive administrated by JennyLurker (version 2.3)