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

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

diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 52658b2d566c7143624283de8d496f4e7e93d8c4..7f87edb42d390cd567920fa1b4ffd3addf799f6d 100644 (file)
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2007-2008
  * Stelian Pop <stelian@popies.net>
@@ -5,8 +6,6 @@
  * Ilko Iliev <www.ronetix.at>
  *
  * Configuation settings for the RONETIX PM9263 board.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -27,9 +26,6 @@
 #define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
 
 #define CONFIG_SYS_AT91_CPU_NAME       "AT91SAM9263"
-#define CONFIG_PM9263          1       /* on a Ronetix PM9263 Board    */
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_SYS_TEXT_BASE   0
 
 #define CONFIG_MACH_TYPE       MACH_TYPE_PM9263
 
@@ -169,18 +165,12 @@
  * BOOTP options
  */
 #define CONFIG_BOOTP_BOOTFILESIZE      1
-#define CONFIG_BOOTP_BOOTPATH          1
-#define CONFIG_BOOTP_GATEWAY           1
-#define CONFIG_BOOTP_HOSTNAME          1
 
 /* SDRAM */
-#define CONFIG_NR_DRAM_BANKS   1
 #define PHYS_SDRAM             0x20000000
 #define PHYS_SDRAM_SIZE                0x04000000      /* 64 megs */
 
 /* NOR flash, if populated */
-#define CONFIG_SYS_FLASH_CFI           1
-#define CONFIG_FLASH_CFI_DRIVER                1
 #define PHYS_FLASH_1                   0x10000000
 #define CONFIG_SYS_FLASH_BASE          PHYS_FLASH_1
 #define CONFIG_SYS_MAX_FLASH_SECT      256
@@ -188,7 +178,6 @@
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_NAND_ATMEL
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           0x40000000
 #define CONFIG_SYS_NAND_DBW_8          1
@@ -233,9 +222,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR                   0x22000000      /* load address */
 
-#define CONFIG_SYS_MEMTEST_START               PHYS_SDRAM
-#define CONFIG_SYS_MEMTEST_END                 0x23e00000
-
 #define CONFIG_SYS_USE_FLASH   1
 #undef CONFIG_SYS_USE_DATAFLASH
 #undef CONFIG_SYS_USE_NANDFLASH
@@ -243,10 +229,6 @@
 #ifdef CONFIG_SYS_USE_DATAFLASH
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_ENV_OFFSET      0x4200
-#define CONFIG_ENV_SIZE                0x4200
-#define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 #define CONFIG_BOOTCOMMAND     "sf probe 0; " \
                                "sf read 0x22000000 0x84000 0x294000; " \
                                "bootm 0x22000000"
@@ -254,16 +236,10 @@
 #elif defined(CONFIG_SYS_USE_NANDFLASH) /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_OFFSET              0x60000
-#define CONFIG_ENV_OFFSET_REDUND       0x80000
-#define CONFIG_ENV_SIZE                0x20000         /* 1 sector = 128 kB */
 #define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
 
 #elif defined(CONFIG_SYS_USE_FLASH) /* CFG_USE_FLASH */
 
-#define CONFIG_ENV_OFFSET      0x40000
-#define CONFIG_ENV_SECT_SIZE   0x10000
-#define        CONFIG_ENV_SIZE         0x10000
 #define CONFIG_ENV_OVERWRITE   1
 
 /* JFFS Partition offset set */
@@ -278,18 +254,9 @@
 
 #define CONFIG_CON_ROT                 "fbcon=rotate:3 "
 
-#define MTDIDS_DEFAULT                 "nor0=physmap-flash.0,nand0=nand"
-#define MTDPARTS_DEFAULT               \
-       "mtdparts=physmap-flash.0:"     \
-               "256k(u-boot)ro,"       \
-               "64k(u-boot-env)ro,"    \
-               "1408k(kernel),"        \
-               "-(rootfs);"            \
-       "nand:-(nand)"
-
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
-       "mtdids=" MTDIDS_DEFAULT "\0"                           \
-       "mtdparts=" MTDPARTS_DEFAULT "\0"                       \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                            \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"                        \
        "partition=nand0,0\0"                                   \
        "ramargs=setenv bootargs $(bootargs) $(mtdparts)\0"     \
        "nfsargs=setenv bootargs root=/dev/nfs rw "             \
@@ -309,10 +276,6 @@
 #error "Undefined memory device"
 #endif
 
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_LONGHELP            1
-#define CONFIG_CMDLINE_EDITING         1
-
 /*
  * Size of malloc() pool
  */