Merge branch 'master' of git://git.denx.de/u-boot-socfpga

[oweals/u-boot.git] / include / configs / qemu-ppce500.h

diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 9517674010b6ac698c0a7184e15c91d1e4e02bb0..47fb181693247ed209af4c7de2fe25c96983004d 100644 (file)
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2011-2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -10,11 +9,6 @@
 #ifndef __QEMU_PPCE500_H
 #define __QEMU_PPCE500_H
 
-#define CONFIG_CMD_REGINFO
-
-#undef CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_TEXT_BASE   0xf01000 /* 15 MB */
-
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
 
 #define CONFIG_SYS_RAMBOOT
@@ -32,11 +26,8 @@
 
 #define CONFIG_SYS_MEMTEST_START       0x00200000      /* memtest works on */
 #define CONFIG_SYS_MEMTEST_END         0x00400000
-#define CONFIG_SYS_ALT_MEMTEST
-#define CONFIG_PANIC_HANG      /* do not reset board on panic */
 
 /* Needed to fill the ccsrbar pointer */
-#define CONFIG_BOARD_EARLY_INIT_F
 
 /* Virtual address to CCSRBAR */
 #define CONFIG_SYS_CCSRBAR             0xe0000000
@@ -68,14 +59,10 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 
 #define CONFIG_SYS_CLK_FREQ        33000000
 
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_SYS_BOOT_BLOCK          0x00000000      /* boot TLB */
 
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 
-#define CONFIG_ENV_IS_NOWHERE
-
 #define CONFIG_HWCONFIG
 
 #define CONFIG_SYS_INIT_RAM_ADDR               0x00100000
@@ -94,7 +81,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)
 #define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)
 
-#define CONFIG_CONS_INDEX      1
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         (get_bus_freq(0))
@@ -114,41 +100,24 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 #define CONFIG_PCI_INDIRECT_BRIDGE
 
 #define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
-#define CONFIG_DOS_PARTITION
 #endif /* CONFIG_PCI */
 
 #define CONFIG_LBA48
-#define CONFIG_DOS_PARTITION
 
 /*
  * Environment
  */
-#define CONFIG_ENV_SIZE                0x2000
 
 #define CONFIG_LOADS_ECHO              /* echo on for serial download */
 
-#define CONFIG_LAST_STAGE_INIT
-
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_IRQ
-
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
 
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_LONGHELP                    /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING                 /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE                   /* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR   0x2000000       /* default load address */
-#define CONFIG_SYS_CBSIZE      256             /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
-#define CONFIG_SYS_MAXARGS     16              /* max number of command args */
-#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */
 
 /*
  * For booting Linux, the board info and command line data
@@ -168,8 +137,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 /* default location for tftp and bootm */
 #define CONFIG_LOADADDR                1000000
 
-#define CONFIG_BAUDRATE        115200
-
 #define CONFIG_BOOTCOMMAND             \
        "test -n \"$qemu_kernel_addr\" && bootm $qemu_kernel_addr - $fdt_addr_r\0"