Re: [U-Boot] [PATCH v2 06/33] x86: config: Move common x86 configs to a common file

2014-11-12 Thread Simon Glass 
On 11 November 2014 01:47, Bin Meng bmeng...@gmail.com wrote:
 On Tue, Nov 11, 2014 at 9:00 AM, Simon Glass s...@chromium.org wrote:
 Many of the x86 CONFIG options will be common across different boards. Move
 them to a common file.

 Signed-off-by: Simon Glass s...@chromium.org
 ---

 Changes in v2:
 - Move some features out of the common file

  include/configs/coreboot.h   | 265 
 ++-
  include/configs/x86-common.h | 251 
  2 files changed, 260 insertions(+), 256 deletions(-)
  create mode 100644 include/configs/x86-common.h

[snip]

 Reviewed-by: Bin Meng bmeng...@gmail.com

Applied to u-boot-x86.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH v2 06/33] x86: config: Move common x86 configs to a common file

2014-11-11 Thread Bin Meng 
On Tue, Nov 11, 2014 at 9:00 AM, Simon Glass s...@chromium.org wrote:
 Many of the x86 CONFIG options will be common across different boards. Move
 them to a common file.

 Signed-off-by: Simon Glass s...@chromium.org
 ---

 Changes in v2:
 - Move some features out of the common file

  include/configs/coreboot.h   | 265 
 ++-
  include/configs/x86-common.h | 251 
  2 files changed, 260 insertions(+), 256 deletions(-)
  create mode 100644 include/configs/x86-common.h

 diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
 index fef267f..2581380 100644
 --- a/include/configs/coreboot.h
 +++ b/include/configs/coreboot.h
 @@ -6,7 +6,6 @@
   * SPDX-License-Identifier:GPL-2.0+
   */

 -#include asm/ibmpc.h
  /*
   * board/config.h - configuration options, board specific
   */
 @@ -14,27 +13,23 @@
  #ifndef __CONFIG_H
  #define __CONFIG_H

 +#include configs/x86-common.h
 +
  /*
   * High Level Configuration Options
   * (easy to change)
   */
  #define CONFIG_SYS_COREBOOT
 -#define CONFIG_SHOW_BOOT_PROGRESS
  #define CONFIG_LAST_STAGE_INIT
 -#define CONFIG_SYS_VSNPRINTF
 -#define CONFIG_ZBOOT_32
 -#define CONFIG_PHYSMEM
  #define CONFIG_SYS_EARLY_PCI_INIT
 -#define CONFIG_DISPLAY_BOARDINFO_LATE
 -#define CONFIG_DISPLAY_CPUINFO

 -#define CONFIG_DM
 -#define CONFIG_CMD_DM
 -#define CONFIG_DM_GPIO
 -#define CONFIG_DM_SERIAL
 +#define CONFIG_SYS_CAR_ADDR0x1920
 +#define CONFIG_SYS_CAR_SIZE(16 * 1024)
 +#define CONFIG_SYS_MONITOR_LEN (256 * 1024)

 -#define CONFIG_LMB
 -#define CONFIG_OF_LIBFDT
 +#define CONFIG_TRACE_EARLY_SIZE(8  20)
 +#define CONFIG_TRACE_EARLY
 +#define CONFIG_TRACE_EARLY_ADDR0x0140

  #define CONFIG_BOOTSTAGE
  #define CONFIG_BOOTSTAGE_REPORT
 @@ -45,26 +40,6 @@
  #define CONFIG_BOOTSTAGE_STASH_SIZE0x7fc
  #define CONFIG_BOOTSTAGE_USER_COUNT60

 -#define CONFIG_LZO
 -#define CONFIG_FIT
 -#undef CONFIG_ZLIB
 -#undef CONFIG_GZIP
 -#define CONFIG_SYS_BOOTM_LEN   (16  20)
 -
 -/*---
 - * Watchdog Configuration
 - */
 -#undef CONFIG_WATCHDOG
 -#undef CONFIG_HW_WATCHDOG
 -
 -/* SATA AHCI storage */
 -
 -#define CONFIG_SCSI_AHCI
 -
 -#ifdef CONFIG_SCSI_AHCI
 -#define CONFIG_LIBATA
 -#define CONFIG_SYS_64BIT_LBA
 -#define CONFIG_SATA_INTEL  1
  #define CONFIG_SCSI_DEV_LIST   {PCI_VENDOR_ID_INTEL, \
 PCI_DEVICE_ID_INTEL_NM10_AHCI},   \
 {PCI_VENDOR_ID_INTEL,   \
 @@ -74,249 +49,27 @@
 {PCI_VENDOR_ID_INTEL,   \
 PCI_DEVICE_ID_INTEL_PANTHERPOINT_AHCI_MOBILE}

 -#define CONFIG_SYS_SCSI_MAX_SCSI_ID2
 -#define CONFIG_SYS_SCSI_MAX_LUN1
 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
 -CONFIG_SYS_SCSI_MAX_LUN)
 -#endif
 -
 -/* Generic TPM interfaced through LPC bus */
 -#define CONFIG_TPM
 -#define CONFIG_TPM_TIS_LPC
 -#define CONFIG_TPM_TIS_BASE_ADDRESS0xfed4
 -
 -/*---
 - * Real Time Clock Configuration
 - */
 -#define CONFIG_RTC_MC146818
 -#define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0
 -#define CONFIG_SYS_ISA_IO  CONFIG_SYS_ISA_IO_BASE_ADDRESS
 -
 -/*---
 - * Serial Configuration
 - */
  #define CONFIG_COREBOOT_SERIAL
 -#define CONFIG_SYS_NS16550
 -#define CONFIG_BAUDRATE115200
 -#define CONFIG_SYS_BAUDRATE_TABLE  {300, 600, 1200, 2400, 4800, \
 -9600, 19200, 38400, 115200}
 -#define CONFIG_SYS_NS16550_PORT_MAPPED

  #define CONFIG_STD_DEVICES_SETTINGS stdin=usbkbd,vga,serial\0 \
 stdout=vga,serial,cbmem\0 \
 stderr=vga,serial,cbmem\0

 -#define CONFIG_CONSOLE_MUX
 -#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 -#define CONFIG_SYS_STDIO_DEREGISTER
  #define CONFIG_CBMEM_CONSOLE

 -#define CONFIG_CMDLINE_EDITING
 -#define CONFIG_COMMAND_HISTORY
 -#define CONFIG_AUTO_COMPLETE
 -#define CONFIG_SYS_HUSH_PARSER
 -
 -#define CONFIG_SUPPORT_VFAT
 -/
 - * ATAPI support (experimental)
 - /
 -#define CONFIG_ATAPI
 -
 -/
 - * DISK Partition support
 - /
 -#define CONFIG_EFI_PARTITION
 -#define CONFIG_DOS_PARTITION
 -#define CONFIG_MAC_PARTITION
 -#define CONFIG_ISO_PARTITION   /* Experimental */
 -
 -#define CONFIG_CMD_PART
 -#define CONFIG_CMD_CBFS
 -#define CONFIG_CMD_EXT4
 -#define CONFIG_CMD_EXT4_WRITE
 -#define

[U-Boot] [PATCH v2 06/33] x86: config: Move common x86 configs to a common file

2014-11-10 Thread Simon Glass 
Many of the x86 CONFIG options will be common across different boards. Move
them to a common file.

Signed-off-by: Simon Glass s...@chromium.org
---

Changes in v2:
- Move some features out of the common file

 include/configs/coreboot.h   | 265 ++-
 include/configs/x86-common.h | 251 
 2 files changed, 260 insertions(+), 256 deletions(-)
 create mode 100644 include/configs/x86-common.h

diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index fef267f..2581380 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -6,7 +6,6 @@
  * SPDX-License-Identifier:GPL-2.0+
  */
 
-#include asm/ibmpc.h
 /*
  * board/config.h - configuration options, board specific
  */
@@ -14,27 +13,23 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include configs/x86-common.h
+
 /*
  * High Level Configuration Options
  * (easy to change)
  */
 #define CONFIG_SYS_COREBOOT
-#define CONFIG_SHOW_BOOT_PROGRESS
 #define CONFIG_LAST_STAGE_INIT
-#define CONFIG_SYS_VSNPRINTF
-#define CONFIG_ZBOOT_32
-#define CONFIG_PHYSMEM
 #define CONFIG_SYS_EARLY_PCI_INIT
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-#define CONFIG_DISPLAY_CPUINFO
 
-#define CONFIG_DM
-#define CONFIG_CMD_DM
-#define CONFIG_DM_GPIO
-#define CONFIG_DM_SERIAL
+#define CONFIG_SYS_CAR_ADDR0x1920
+#define CONFIG_SYS_CAR_SIZE(16 * 1024)
+#define CONFIG_SYS_MONITOR_LEN (256 * 1024)
 
-#define CONFIG_LMB
-#define CONFIG_OF_LIBFDT
+#define CONFIG_TRACE_EARLY_SIZE(8  20)
+#define CONFIG_TRACE_EARLY
+#define CONFIG_TRACE_EARLY_ADDR0x0140
 
 #define CONFIG_BOOTSTAGE
 #define CONFIG_BOOTSTAGE_REPORT
@@ -45,26 +40,6 @@
 #define CONFIG_BOOTSTAGE_STASH_SIZE0x7fc
 #define CONFIG_BOOTSTAGE_USER_COUNT60
 
-#define CONFIG_LZO
-#define CONFIG_FIT
-#undef CONFIG_ZLIB
-#undef CONFIG_GZIP
-#define CONFIG_SYS_BOOTM_LEN   (16  20)
-
-/*---
- * Watchdog Configuration
- */
-#undef CONFIG_WATCHDOG
-#undef CONFIG_HW_WATCHDOG
-
-/* SATA AHCI storage */
-
-#define CONFIG_SCSI_AHCI
-
-#ifdef CONFIG_SCSI_AHCI
-#define CONFIG_LIBATA
-#define CONFIG_SYS_64BIT_LBA
-#define CONFIG_SATA_INTEL  1
 #define CONFIG_SCSI_DEV_LIST   {PCI_VENDOR_ID_INTEL, \
PCI_DEVICE_ID_INTEL_NM10_AHCI},   \
{PCI_VENDOR_ID_INTEL,   \
@@ -74,249 +49,27 @@
{PCI_VENDOR_ID_INTEL,   \
PCI_DEVICE_ID_INTEL_PANTHERPOINT_AHCI_MOBILE}
 
-#define CONFIG_SYS_SCSI_MAX_SCSI_ID2
-#define CONFIG_SYS_SCSI_MAX_LUN1
-#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
-CONFIG_SYS_SCSI_MAX_LUN)
-#endif
-
-/* Generic TPM interfaced through LPC bus */
-#define CONFIG_TPM
-#define CONFIG_TPM_TIS_LPC
-#define CONFIG_TPM_TIS_BASE_ADDRESS0xfed4
-
-/*---
- * Real Time Clock Configuration
- */
-#define CONFIG_RTC_MC146818
-#define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0
-#define CONFIG_SYS_ISA_IO  CONFIG_SYS_ISA_IO_BASE_ADDRESS
-
-/*---
- * Serial Configuration
- */
 #define CONFIG_COREBOOT_SERIAL
-#define CONFIG_SYS_NS16550
-#define CONFIG_BAUDRATE115200
-#define CONFIG_SYS_BAUDRATE_TABLE  {300, 600, 1200, 2400, 4800, \
-9600, 19200, 38400, 115200}
-#define CONFIG_SYS_NS16550_PORT_MAPPED
 
 #define CONFIG_STD_DEVICES_SETTINGS stdin=usbkbd,vga,serial\0 \
stdout=vga,serial,cbmem\0 \
stderr=vga,serial,cbmem\0
 
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_SYS_STDIO_DEREGISTER
 #define CONFIG_CBMEM_CONSOLE
 
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_COMMAND_HISTORY
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_HUSH_PARSER
-
-#define CONFIG_SUPPORT_VFAT
-/
- * ATAPI support (experimental)
- /
-#define CONFIG_ATAPI
-
-/
- * DISK Partition support
- /
-#define CONFIG_EFI_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION   /* Experimental */
-
-#define CONFIG_CMD_PART
-#define CONFIG_CMD_CBFS
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_EXT4_WRITE
-#define CONFIG_PARTITION_UUIDS
-
-/*---
- * Video Configuration
- */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_COREBOOT
-#define CONFIG_VIDEO_SW_CURSOR