machines: oxe810 renamed to oxnas

- avoid future confusions (oxe810 is just the processor, oxnas is the
  official name of the device)
- affects machine conf, linux kernel, and u-boot

5 files changed, 6 insertions, 6 deletions

diff --git a/packages/linux/linux-2.6.24/oxe810/defconfig b/packages/linux/linux-2.6.24/oxnas/defconfig
index 5382e30f85..5382e30f85 100644
--- a/packages/linux/linux-2.6.24/oxe810/defconfig
+++ b/packages/linux/linux-2.6.24/oxnas/defconfig
diff --git a/packages/linux/linux-2.6.24/oxe810/oxe810.diff b/packages/linux/linux-2.6.24/oxnas/oxnas.diff
index 04ff1a670b..04ff1a670b 100644
--- a/packages/linux/linux-2.6.24/oxe810/oxe810.diff
+++ b/packages/linux/linux-2.6.24/oxnas/oxnas.diff
diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb
index d7b9abf506..a70376c0d2 100644
--- a/packages/linux/linux_2.6.24.bb
+++ b/packages/linux/linux_2.6.24.bb
@@ -8,10 +8,10 @@ DEFAULT_PREFERENCE_simpad = "1"
 DEFAULT_PREFERENCE_atngw100 = "1"
 DEFAULT_PREFERENCE_at32stk1000 = "1"
 DEFAULT_PREFERENCE_ts72xx = "1"
-DEFAULT_PREFERENCE_oxe810 = "1"
+DEFAULT_PREFERENCE_oxnas = "1"
 DEFAULT_PREFERENCE_cs-e9302 = "1"
 
-PR = "r18"
+PR = "r19"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
            http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
@@ -84,8 +84,8 @@ SRC_URI_append_ts72xx = "\
 	file://ts72xx-use-cpld-reset.patch;patch=1 \
 	file://ts72xx-rs485.patch;patch=1"
 
-SRC_URI_append_oxe810 = " \
-	file://oxe810.diff;patch=1 \
+SRC_URI_append_oxnas = " \
+	file://oxnas.diff;patch=1 \
 	"
 
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
diff --git a/packages/u-boot/u-boot-1.1.2/oxe810.patch b/packages/u-boot/u-boot-1.1.2/oxnas.patch
index f1fff14822..f1fff14822 100644
--- a/packages/u-boot/u-boot-1.1.2/oxe810.patch
+++ b/packages/u-boot/u-boot-1.1.2/oxnas.patch
diff --git a/packages/u-boot/u-boot_1.1.2.bb b/packages/u-boot/u-boot_1.1.2.bb
index 1afb3eec5a..c83e31f532 100644
--- a/packages/u-boot/u-boot_1.1.2.bb
+++ b/packages/u-boot/u-boot_1.1.2.bb
@@ -13,7 +13,7 @@ SRC_URI_append_mnci   = "file://mnci.patch;patch=1 \
                          file://command-names.patch;patch=1"
 
 SRC_URI_append_magicbox  = "file://u-boot-emetec.patch;patch=1 "
-SRC_URI_append_oxe810  = "file://oxe810.patch;patch=1 "
+SRC_URI_append_oxnas     = "file://oxnas.patch;patch=1 "
 
 
 # TODO: SRC_URI_append_rt3000
@@ -23,7 +23,7 @@ TARGET_LDFLAGS = ""
 UBOOT_MACHINE_mnci   = "mnci_config"
 UBOOT_MACHINE_vibren = "pxa255_idp_config"
 UBOOT_MACHINE_magicbox = "EMETEC405_config"
-UBOOT_MACHINE_oxe810 = "oxnas_config"
+UBOOT_MACHINE_oxnas  = "oxnas_config"
 
 inherit base