diff options
| author |   Koen Kooi <koen@openembedded.org> | 2008-11-17 15:25:36 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-11-17 15:25:36 +0100 |
| commit | fc935de948bc9f9235bea14a525f71cc819cfc17 (patch) | |
| tree | f310d2b0c94b102ea7b5c448f476b9eeeaac6594 | |
| parent | 533bb113090601f260d023cafe2ca5e4a8efdfd1 (diff) | |
| parent | 99635191b28f408e4d99a74419c45b76549cd508 (diff) | |
| download | openembedded-fc935de948bc9f9235bea14a525f71cc819cfc17.tar.gz | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | packages/linux/linux_2.6.24.bb | 5 | ||||
| -rw-r--r-- | packages/u-boot/u-boot_1.1.2.bb | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb index e787663bc7..40c23237fb 100644 --- a/packages/linux/linux_2.6.24.bb +++ b/packages/linux/linux_2.6.24.bb @@ -8,6 +8,7 @@ DEFAULT_PREFERENCE_simpad = "1" DEFAULT_PREFERENCE_atngw100 = "1" DEFAULT_PREFERENCE_at32stk1000 = "1" DEFAULT_PREFERENCE_ts72xx = "1" +DEFAULT_PREFERENCE_oxe810 = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" PR = "r17" @@ -82,6 +83,10 @@ 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 \ + " + 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" FILES_kernel-image_gesbc-9302 = "" diff --git a/packages/u-boot/u-boot_1.1.2.bb b/packages/u-boot/u-boot_1.1.2.bb index 8287d35a1d..1afb3eec5a 100644 --- a/packages/u-boot/u-boot_1.1.2.bb +++ b/packages/u-boot/u-boot_1.1.2.bb @@ -13,6 +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 " # TODO: SRC_URI_append_rt3000 @@ -22,6 +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" inherit base |