X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fdns325.h;h=dec71038bf219ee932dd677a9bbe65d0af3f155a;hb=e883ffe00b6db807544c70e743cf7832d5d56d40;hp=e8ce8dbb2e1bee05a4530f77fecf1105f4621f11;hpb=16437a195a6d881a8e76c6db789edc92f2542645;p=u-boot diff --git a/include/configs/dns325.h b/include/configs/dns325.h index e8ce8dbb2e..dec71038bf 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 * Stefan Herbrechtsmeier @@ -6,8 +7,6 @@ * (C) Copyright 2009 * Marvell Semiconductor * Written-by: Prafulla Wadaskar - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _CONFIG_DNS325_H @@ -16,9 +15,7 @@ /* * Machine number definition */ -#define MACH_TYPE_DNS325 3800 #define CONFIG_MACH_TYPE MACH_TYPE_DNS325 -#define CONFIG_IDENT_STRING "\nD-Link DNS-325" /* * High Level Configuration Options (easy to change) @@ -30,16 +27,8 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#include -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_ENV -#define CONFIG_CMD_NAND -#define CONFIG_CMD_PING -#define CONFIG_CMD_USB -#define CONFIG_CMD_IDE -#define CONFIG_CMD_DATE -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS #define CONFIG_NR_DRAM_BANKS 1 @@ -50,7 +39,6 @@ #include "mv-common.h" /* Remove or override few declarations from mv-common.h */ -#undef CONFIG_SYS_PROMPT /* * Ethernet Driver configuration @@ -80,35 +68,11 @@ */ #define CONFIG_KIRKWOOD_GPIO -/* - * Use the HUSH parser - */ -#define CONFIG_SYS_HUSH_PARSER - -/* - * Console configuration - */ -#define CONFIG_CONSOLE_MUX -#define CONFIG_SYS_CONSOLE_IS_IN_ENV - -/* - * Enable device tree support - */ -#define CONFIG_OF_LIBFDT - -/* - * Display cpu info at boot - */ -#define CONFIG_DISPLAY_CPUINFO - /* * Environment variables configurations */ #ifdef CONFIG_CMD_NAND -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128KB */ -#else -#define CONFIG_ENV_IS_NOWHERE #endif #define CONFIG_ENV_SIZE 0x20000 /* 128KB */ @@ -118,10 +82,6 @@ /* * Default environment variables */ -#define MTDIDS_DEFAULT "nand0=orion_nand" - -#define MTDPARTS_DEFAULT "mtdparts=orion_nand:" \ - "896k(u-boot),128k(u-boot-env),5m(kernel),-(rootfs)\0" #define CONFIG_EXTRA_ENV_SETTINGS \ "stdin=serial\0" \ @@ -130,7 +90,7 @@ "loadaddr=0x800000\0" \ "autoload=no\0" \ "console=ttyS0,115200\0" \ - "mtdparts="MTDPARTS_DEFAULT \ + "mtdparts="CONFIG_MTDPARTS_DEFAULT \ "optargs=\0" \ "bootenv=uEnv.txt\0" \ "importbootenv=echo Importing environment ...; " \