Remove CONFIG_BOARDNAME and CONFIG_BOARD_NAME
Both of these variables are used in a few hard-coded ways to set some
string values or print something to the user. In almost all cases, it's
just as useful to hard-code the value used. The exception here is
printing something closer to correct board name for p1_p2_rdb machines.
This can be done using something from the device tree, but for now
hard-code a non-CONFIG based value instead.
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index a27093f..1f28871 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -44,18 +44,17 @@
/* Environment is stored in the eMMC boot partition */
#define CONFIG_ENV_VERSION 100
-#define CONFIG_BOARD_NAME opos6ul
#define ACFG_CONSOLE_DEV ttymxc0
#define CONFIG_SYS_AUTOLOAD "no"
-#define CONFIG_ROOTPATH "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root"
+#define CONFIG_ROOTPATH "/tftpboot/opos6ul-root"
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" __stringify(CONFIG_ENV_VERSION) "\0" \
"consoledev=" __stringify(ACFG_CONSOLE_DEV) "\0" \
- "board_name=" __stringify(CONFIG_BOARD_NAME) "\0" \
+ "board_name=opos6ul\0" \
"fdt_addr=0x88000000\0" \
"fdt_high=0xffffffff\0" \
- "fdt_name=" __stringify(CONFIG_BOARD_NAME) "dev\0" \
+ "fdt_name=opos6uldev\0" \
"initrd_high=0xffffffff\0" \
"ip_dyn=yes\0" \
"stdin=serial\0" \
@@ -65,7 +64,7 @@
"mmcpart=2\0" \
"mmcroot=/dev/mmcblk0p2 ro\0" \
"mmcrootfstype=ext4 rootwait\0" \
- "kernelimg=" __stringify(CONFIG_BOARD_NAME) "-linux.bin\0" \
+ "kernelimg=opos6ul-linux.bin\0" \
"splashpos=0,0\0" \
"splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"videomode=video=ctfb:x:800,y:480,depth:18,pclk:33033,le:96,ri:96,up:20,lo:21,hs:64,vs:4,sync:0,vmode:0\0" \