summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-04-18 22:41:06 +0200
committerWolfgang Denk <wd@denx.de>2012-04-18 22:41:06 +0200
commit8262e61df521f387fdd2c5abd82ffe84e7c5f261 (patch)
tree28ad368f2b3f95594509b2fbf1bad89fe60b9804
parent03f3587822839d90b1b118d3cd51c59d8b4d5b32 (diff)
parent77fe6e773af762676f4f30f646caa160e39a0bcc (diff)
downloadu-boot-imx-8262e61df521f387fdd2c5abd82ffe84e7c5f261.zip
u-boot-imx-8262e61df521f387fdd2c5abd82ffe84e7c5f261.tar.gz
u-boot-imx-8262e61df521f387fdd2c5abd82ffe84e7c5f261.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-sh
* 'master' of git://git.denx.de/u-boot-sh: sh: ecovec: Change macro from BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT sh: Fix rsk7264 pin setup for on-board ethernet
-rw-r--r--board/renesas/rsk7264/lowlevel_init.S2
-rw-r--r--include/configs/ecovec.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/renesas/rsk7264/lowlevel_init.S b/board/renesas/rsk7264/lowlevel_init.S
index fc759bd..39acfa7 100644
--- a/board/renesas/rsk7264/lowlevel_init.S
+++ b/board/renesas/rsk7264/lowlevel_init.S
@@ -185,7 +185,7 @@ CS0WCR_D: .long 0x00000B41
CS0BCR_A: .long 0xFFFC0004
CS0BCR_D: .long 0x10000400
PJCR0_A: .long 0xFFFE390E
-PJCR0_D: .word 0x0300
+PJCR0_D: .word 0x3300
.align 2
CS2WCR_A: .long 0xFFFC0030
CS2WCR_D: .long 0x00000B01
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index 901a0e0..4d09132 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -43,7 +43,7 @@
#define CONFIG_SH4 1
#define CONFIG_SH4A 1
#define CONFIG_CPU_SH7724 1
-#define BOARD_LATE_INIT 1
+#define CONFIG_BOARD_LATE_INIT 1
#define CONFIG_ECOVEC 1
#define CONFIG_ECOVEC_ROMIMAGE_ADDR 0xA0040000