[U-Boot] [PATCH 7/8] mpc83xx: MPC8315ERDB: Use hwconfig for board type selection

Anton Vorontsov
2009-06-09T20:25:36Z

This patch simply converts the board to the hwconfig infrastructure.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---
board/freescale/mpc8315erdb/mpc8315erdb.c | 14 +++++---------
include/configs/MPC8315ERDB.h | 1 +
2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
index 9d6896d..d9cff86 100644
--- 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>
@@ -177,20 +178,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 e3dcf96..6ed3a9f 100644
--- 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
--
1.6.3.1