mpc83xx: MPC8315ERDB: Use hwconfig for board type selection

This patch simply converts the board to the hwconfig infrastructure.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>

diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
index f80b0ba4a59649feab8acf228d4814be45ed3f06..dea4d6fe7afdd45c2cd6511f79b396dc2ca347d7 100644 (file)
--- a/board/freescale/mpc8315erdb/mpc8315erdb.c
+++ b/board/freescale/mpc8315erdb/mpc8315erdb.c
@@ -24,6 +24,7 @@
  */
 
 #include <common.h>
+#include <hwconfig.h>
 #include <i2c.h>
 #include <libfdt.h>
 #include <fdt_support.h>
@@ -176,20 +177,15 @@ void pci_init_board(void)
 #if defined(CONFIG_OF_BOARD_SETUP)
 void fdt_tsec1_fixup(void *fdt, bd_t *bd)
 {
-       char *mpc8315erdb = getenv("mpc8315erdb");
        const char disabled[] = "disabled";
        const char *path;
        int ret;
 
-       if (!mpc8315erdb)
+       if (hwconfig_arg_cmp("board_type", "tsec1")) {
                return;
-
-       if (!strcmp(mpc8315erdb, "tsec1")) {
-               return;
-       } else if (strcmp(mpc8315erdb, "ulpi")) {
-               printf("WARNING: wrong `mpc8315erdb' environment "
-                      "variable specified: `%s'. Should be `ulpi' "
-                      "or `tsec1'.\n", mpc8315erdb);
+       } else if (!hwconfig_arg_cmp("board_type", "ulpi")) {
+               printf("NOTICE: No or unknown board_type hwconfig specified.\n"
+                      "        Assuming board with TSEC1.\n");
                return;
        }
 

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 4cf48f7bc083fc89d6327e42a9637495b6352316..7e6b9eb876ebd29617316c70868f072a27efc8f5 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -72,6 +72,7 @@
 #define CONFIG_SYS_SICRL               0x00000000 /* 3.3V, no delay */
 
 #define CONFIG_BOARD_EARLY_INIT_F /* call board_pre_init */
+#define CONFIG_HWCONFIG
 
 /*
  * IMMR new address