summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-09-09 11:59:45 +0000
committerRod Whitby <rod@whitby.id.au>2007-09-09 11:59:45 +0000
commitfb407f654d8492a1a08b769fa8a74634c8ed391e (patch)
tree7fef9ad3b905b5545217b919b3b588cacdbca2db
parentb3f27b8cc1431aef66ee32f717b55ad590fe0098 (diff)
parente4ef6eacfb2280a4d63cd569d691280fdf6b0e8f (diff)
merge of '1cc47f2936bc6346f6e03128eb46345963c599a3'
and '4d05fe1b9b1c9939ad7429871e3fbf805a8d316b'
-rw-r--r--packages/linux/linux-ezx-2.6.21/e6/.mtn2git_empty0
-rwxr-xr-xpackages/linux/linux-ezx-2.6.21/rokre2/defconfig (renamed from packages/linux/linux-ezx-2.6.21/e2/defconfig)0
-rw-r--r--packages/linux/linux-ezx-2.6.21/rokre6/.mtn2git_empty (renamed from packages/linux/linux-ezx-2.6.21/e2/.mtn2git_empty)0
-rwxr-xr-xpackages/linux/linux-ezx-2.6.21/rokre6/defconfig (renamed from packages/linux/linux-ezx-2.6.21/e6/defconfig)0
-rw-r--r--packages/linux/linux.inc4
5 files changed, 3 insertions, 1 deletions
diff --git a/packages/linux/linux-ezx-2.6.21/e6/.mtn2git_empty b/packages/linux/linux-ezx-2.6.21/e6/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/linux/linux-ezx-2.6.21/e6/.mtn2git_empty
+++ /dev/null
diff --git a/packages/linux/linux-ezx-2.6.21/e2/defconfig b/packages/linux/linux-ezx-2.6.21/rokre2/defconfig
index be512457d9..be512457d9 100755
--- a/packages/linux/linux-ezx-2.6.21/e2/defconfig
+++ b/packages/linux/linux-ezx-2.6.21/rokre2/defconfig
diff --git a/packages/linux/linux-ezx-2.6.21/e2/.mtn2git_empty b/packages/linux/linux-ezx-2.6.21/rokre6/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-ezx-2.6.21/e2/.mtn2git_empty
+++ b/packages/linux/linux-ezx-2.6.21/rokre6/.mtn2git_empty
diff --git a/packages/linux/linux-ezx-2.6.21/e6/defconfig b/packages/linux/linux-ezx-2.6.21/rokre6/defconfig
index 75ee2803d9..75ee2803d9 100755
--- a/packages/linux/linux-ezx-2.6.21/e6/defconfig
+++ b/packages/linux/linux-ezx-2.6.21/rokre6/defconfig
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index 05bfc2f472..14b0987970 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -12,10 +12,12 @@ DEPENDS_at91sam9260ek = "u-boot-mkimage-openmoko-native"
DEPENDS_sarge-at91 = "u-boot-mkimage-openmoko-native"
DEPENDS_gumstix-connex = "u-boot-mkimage-openmoko-native"
DEPENDS_gumstix-verdex = "u-boot-mkimage-openmoko-native"
+DEPENDS_fic-gta01 = "u-boot-mkimage-openmoko-native"
+DEPENDS_fic-gta02 = "u-boot-mkimage-openmoko-native"
inherit kernel
-# Specify the commandline for you device here:
+# Specify the commandline for you device
#boot from mmc
CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfstype=ext2 rootdelay=5"