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

diff --git a/board/renesas/rsk7264/lowlevel_init.S b/board/renesas/rsk7264/lowlevel_init.S
index fc759bd5f2ae7e320ecc8aa7655e0f77a8067616..39acfa762674499c3ea75076015bc0d0062a1437 100644 (file)
--- 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 901a0e0f2eaccd1bd9292800cb585d654cba7c59..4d09132701a60104baa1f4e3bff265e459d1b128 100644 (file)
--- 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