disk: convert CONFIG_MAC_PARTITION to Kconfig

[platform/kernel/u-boot.git] / include / configs / sh7785lcr.h

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 11a4cf9..687c65f 100644 (file)
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -9,7 +9,6 @@
 #ifndef __SH7785LCR_H
 #define __SH7785LCR_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7785      1
 #define CONFIG_SH7785LCR       1
 
@@ -18,7 +17,6 @@
 #define CONFIG_CMD_SH_ZIMAGEBOOT
 
 #define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
 
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTARGS                "console=ttySC1,115200 root=/dev/nfs ip=dhcp"
@@ -27,6 +25,7 @@
        "bootdevice=0:1\0"                                              \
        "usbload=usb reset;usbboot;usb stop;bootm\0"
 
+#define CONFIG_DISPLAY_BOARDINFO
 #undef CONFIG_SHOW_BOOT_PROGRESS
 
 /* MEMORY */
@@ -106,7 +105,6 @@
 #define CONFIG_R8A66597_ENDIAN         0x0000  /* little */
 
 /* PCI Controller */
-#define CONFIG_PCI
 #define CONFIG_SH4_PCI
 #define CONFIG_SH7780_PCI
 #if defined(CONFIG_SH_32BIT)
@@ -118,7 +116,6 @@
 #define CONFIG_SH7780_PCI_LAR  CONFIG_SYS_SDRAM_SIZE
 #define CONFIG_SH7780_PCI_BAR  CONFIG_SYS_SDRAM_SIZE
 #endif
-#define CONFIG_PCI_PNP
 #define CONFIG_PCI_SCAN_SHOW   1
 
 #define CONFIG_PCI_MEM_BUS     0xFD000000      /* Memory space base addr */