diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-06 20:43:38 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-06 20:43:38 +0000 |
| commit | 271c9e5762efadf4865dd5813ddaefc3bf55ec1e (patch) | |
| tree | 4f99155131b98dc20b1fcf79b9308f7c320270ee /packages/uboot | |
| parent | e4acd15efd9ab07619960d7c8eaaf720308f5cc0 (diff) | |
| parent | d7088faa1bee47c4ad987c24a76db38316606b75 (diff) | |
merge of '75de3114c40a44451af2c6d7f40334d41425ff61'
and '806fe4d016a4ba9669539e4b9ededde428d2e610'
Diffstat (limited to 'packages/uboot')
| -rw-r--r-- | packages/uboot/u-boot-1.1.6/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-1.1.6/devkit-idp.patch | 28 | ||||
| -rw-r--r-- | packages/uboot/u-boot_1.1.6.bb | 5 |
3 files changed, 31 insertions, 2 deletions
diff --git a/packages/uboot/u-boot-1.1.6/.mtn2git_empty b/packages/uboot/u-boot-1.1.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uboot/u-boot-1.1.6/.mtn2git_empty diff --git a/packages/uboot/u-boot-1.1.6/devkit-idp.patch b/packages/uboot/u-boot-1.1.6/devkit-idp.patch new file mode 100644 index 0000000000..1460c3d1f0 --- /dev/null +++ b/packages/uboot/u-boot-1.1.6/devkit-idp.patch @@ -0,0 +1,28 @@ +Index: u-boot-1.1.6/board/pxa255_idp/memsetup.S +=================================================================== +--- u-boot-1.1.6.orig/board/pxa255_idp/memsetup.S ++++ u-boot-1.1.6/board/pxa255_idp/memsetup.S +@@ -41,8 +41,8 @@ DRAM_SIZE: .long CFG_DRAM_SIZE + /* + * Memory setup + */ +-.globl memsetup +-memsetup: ++.globl lowlevel_init ++lowlevel_init: + + mov r10, lr + +Index: u-boot-1.1.6/include/configs/pxa255_idp.h +=================================================================== +--- u-boot-1.1.6.orig/include/configs/pxa255_idp.h ++++ u-boot-1.1.6/include/configs/pxa255_idp.h +@@ -41,7 +41,7 @@ + * If we are developing, we might want to start armboot from ram + * so we MUST NOT initialize critical regs like mem-timing ... + */ +-#define CONFIG_INIT_CRITICAL /* undef for developing */ ++#undef CONFIG_INIT_CRITICAL /* undef for developing */ + + /* + * define the following to enable debug blinks. A debug blink function diff --git a/packages/uboot/u-boot_1.1.6.bb b/packages/uboot/u-boot_1.1.6.bb index b45e86611b..bfd0fb8132 100644 --- a/packages/uboot/u-boot_1.1.6.bb +++ b/packages/uboot/u-boot_1.1.6.bb @@ -4,9 +4,10 @@ SECTION = "bootloader" PRIORITY = "optional" LICENSE = "GPL" -PR = "r0" +PR = "r1" -SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.6.tar.bz2" +SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.6.tar.bz2 \ + file://devkit-idp.patch;patch=1" EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" |