diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-23 11:34:50 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-23 11:34:50 +0100 |
| commit | 211f44870d9907fdfb6ce7c706599bfd3093f745 (patch) | |
| tree | 99a1445461a2ef40756f4ce5a11a9638a6d589cb | |
| parent | a55e9a527a8c9823044196d031f2da2783ff8f35 (diff) | |
| parent | 7c61ef493c215fc749225dd436b4f43bb358003e (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
| -rw-r--r-- | recipes/e17/e-wm_svn.bb | 7 | ||||
| -rw-r--r-- | recipes/u-boot/u-boot-2009.03/hipox/00-hipox.patch | 12 | ||||
| -rw-r--r-- | recipes/u-boot/u-boot-2009.03/hipox/02-hipox-enable-mmu.patch | 2 |
3 files changed, 13 insertions, 8 deletions
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index 83dbd81dde..a935728e02 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -80,6 +80,7 @@ PACKAGES =+ "\ ${PN}-input-methods \ ${PN}-sysactions \ ${PN}-utils \ + ${PN}-menu \ " RRECOMMENDS_${PN} = "\ @@ -89,6 +90,7 @@ RRECOMMENDS_${PN} = "\ ${PN}-other \ ${PN}-input-methods \ ${PN}-sysactions \ + ${PN}-menu \ " PACKAGE_ARCH_${PN}-config-default = "all" @@ -106,6 +108,7 @@ PACKAGE_ARCH_${PN}-icons = "all" PACKAGE_ARCH_${PN}-other = "all" PACKAGE_ARCH_${PN}-input-methods = "all" PACKAGE_ARCH_${PN}-sysactions = "all" +PACKAGE_ARCH_${PN}-menu = "all" FILES_${PN} = "\ ${bindir}/* \ @@ -140,6 +143,7 @@ FILES_${PN}-other = "${datadir}/enlightenment/data/other" FILES_${PN}-input-methods = "${datadir}/enlightenment/data/input_methods" FILES_${PN}-sysactions = "${sysconfdir}/enlightenment/sysactions.conf" FILES_${PN}-utils = "${libdir}/enlightenment/utils/*" +FILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu" RRECOMMENDS_${PN}-config-default = "${PN}-theme-default" RRECOMMENDS_${PN}-config-illume = "${PN}-theme-illume" @@ -165,7 +169,8 @@ FILES_${PN}-doc += "\ ${datadir}/enlightenment/doc \ " -CONFFILES_${PN} = "${sysconfdir}/xdg/menus/applications.menu" +CONFFILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu" +CONFFILES_${PN}-sysactions = "/etc/enlightenment/sysactions.conf" ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe" ALTERNATIVE_NAME = "x-window-manager" diff --git a/recipes/u-boot/u-boot-2009.03/hipox/00-hipox.patch b/recipes/u-boot/u-boot-2009.03/hipox/00-hipox.patch index 1433e90193..5b91d28da3 100644 --- a/recipes/u-boot/u-boot-2009.03/hipox/00-hipox.patch +++ b/recipes/u-boot/u-boot-2009.03/hipox/00-hipox.patch @@ -6348,7 +6348,7 @@ diff -Nurd u-boot-2009.03.orig/include/configs/hipox.h u-boot-2009.03/include/co + +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_DIAG -+#define CONFIG_CMD_PING ++//#define CONFIG_CMD_PING + +/** + * Architecture @@ -6675,12 +6675,12 @@ diff -Nurd u-boot-2009.03.orig/include/configs/hipox.h u-boot-2009.03/include/co +#define MTDIDS_DEFAULT "nand0=MT29FXX" +#define MTDPARTS_DEFAULT "mtdparts=MT29FXX:" \ + "32m(boot)," \ -+ "224m(system)" ++ "480m(system)" + -+#define NUM_FLASH_MAIN_BLOCKS 63 /* For Intel 28F320B3T */ -+#define NUM_FLASH_PARAM_BLOCKS 8 /* For Intel 28F320B3T */ -+#define FLASH_MAIN_BLOCK_SIZE (64*1024) /* For Intel 28F320B3T family */ -+#define FLASH_PARAM_BLOCK_SIZE (8*1024) /* For Intel 28F320B3T family */ ++#define NUM_FLASH_MAIN_BLOCKS 31 /* For Atmel AT49BV163D */ ++#define NUM_FLASH_PARAM_BLOCKS 8 /* For Atmel AT49BV163D */ ++#define FLASH_MAIN_BLOCK_SIZE (64*1024) ++#define FLASH_PARAM_BLOCK_SIZE (8*1024) + +/* Assuming counts main blocks and parameter blocks, as the Intel/AMD detection */ +/* I'm intending to copy would seem to indicate */ diff --git a/recipes/u-boot/u-boot-2009.03/hipox/02-hipox-enable-mmu.patch b/recipes/u-boot/u-boot-2009.03/hipox/02-hipox-enable-mmu.patch index b7ddf27d27..e256c17fea 100644 --- a/recipes/u-boot/u-boot-2009.03/hipox/02-hipox-enable-mmu.patch +++ b/recipes/u-boot/u-boot-2009.03/hipox/02-hipox-enable-mmu.patch @@ -274,7 +274,7 @@ diff -Nurd u-boot-2009.03.orig/include/configs/hipox.h u-boot-2009.03/include/co @@ -34,6 +34,7 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_DIAG - #define CONFIG_CMD_PING + //#define CONFIG_CMD_PING +#define CONFIG_CMD_CACHE /** |