diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-11-24 16:33:51 +0000 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-11-24 16:33:51 +0000 |
| commit | 9a681a2affece3d2a9230c4939450d9392c33bf9 (patch) | |
| tree | 15f0a38d8bdee1eb0e9bae2e6277b03c28bd3fe8 /recipes/u-boot | |
| parent | 880e00d3b7ccf66d9421a06bc28e553e07842b59 (diff) | |
| parent | a12117346588829898e6a041a4432fb0370c0c76 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded
Diffstat (limited to 'recipes/u-boot')
| -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 | ||||
| -rw-r--r-- | recipes/u-boot/u-boot_git.bb | 16 |
3 files changed, 16 insertions, 14 deletions
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 /** diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index e674e4d25b..ef36f42cf3 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR ="r35" +PR ="r36" FILESPATHPKG =. "u-boot-git:" @@ -102,13 +102,15 @@ SRC_URI_dm6467t-evm = "git://arago-project.org/git/people/hemant/u-boot-dm646x.g SRCREV_dm6467t-evm = "3da7475ae13445ba89c77ea563ccdfb9df540bb7" PV_dm6467t-evm = "2009.08+gitr${SRCREV}" -SRC_URI_da830-omapl137-evm = "git://arago-project.org/git/people/sekhar/u-boot-omapl1.git;protocol=git;branch=wakeup" -SRCREV_da830-omapl137-evm = "04a03bb477ad842b84c61b29f11422089ad0088d" -PV_da830-omapl137-evm = "2009.01+gitr${SRCREV}" +# Corresponding to PSP 3.20.00.07 Release +SRC_URI_da830-omapl137-evm = "git://arago-project.org/git/people/sekhar/u-boot-omapl1.git;protocol=git;branch=master" +SRCREV_da830-omapl137-evm = "0d291f2f255e6d66a78b3dc2445362a96ae39a57" +PV_da830-omapl137-evm = "2009.08+gitr${SRCREV}" -SRC_URI_da850-omapl138-evm = "git://arago-project.org/git/people/sekhar/u-boot-omapl1.git;protocol=git;branch=wakeup" -SRCREV_da850-omapl138-evm = "04a03bb477ad842b84c61b29f11422089ad0088d" -PV_da850-omapl138-evm = "2009.01+gitr${SRCREV}" +# Corresponding to PSP 3.20.00.07 Release +SRC_URI_da850-omapl138-evm = "git://arago-project.org/git/people/sekhar/u-boot-omapl1.git;protocol=git;branch=master" +SRCREV_da850-omapl138-evm = "0d291f2f255e6d66a78b3dc2445362a96ae39a57" +PV_da850-omapl138-evm = "2009.08+gitr${SRCREV}" SRC_URI_dm355-leopard = "git://www.denx.de/git/u-boot-arm.git;protocol=git;branch=next \ file://leopardboard-support.patch;patch=1 \ |