From c68c03f52badc90951dbf8a054c0e500e04bf365 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 10 Oct 2017 21:59:42 +0300 Subject: Drop CONFIG_HAS_DATAFLASH Last user of this option went away in commit: fdc7718999 ("board: usb_a9263: Update to support DT and DM") Signed-off-by: Tuomas Tynkkynen --- board/atmel/at91sam9260ek/Makefile | 1 - board/atmel/at91sam9260ek/partition.c | 26 ------------------------- board/atmel/at91sam9261ek/Makefile | 1 - board/atmel/at91sam9261ek/partition.c | 26 ------------------------- board/atmel/at91sam9263ek/Makefile | 1 - board/atmel/at91sam9263ek/partition.c | 25 ------------------------ board/atmel/at91sam9rlek/Makefile | 1 - board/atmel/at91sam9rlek/partition.c | 25 ------------------------ board/esd/meesc/Makefile | 1 - board/esd/meesc/partition.c | 23 ---------------------- board/mini-box/picosam9g45/picosam9g45.c | 3 --- board/ronetix/pm9261/Makefile | 1 - board/ronetix/pm9261/partition.c | 33 -------------------------------- board/ronetix/pm9263/Makefile | 1 - board/ronetix/pm9263/partition.c | 33 -------------------------------- board/siemens/corvus/board.c | 3 --- 16 files changed, 204 deletions(-) delete mode 100644 board/atmel/at91sam9260ek/partition.c delete mode 100644 board/atmel/at91sam9261ek/partition.c delete mode 100644 board/atmel/at91sam9263ek/partition.c delete mode 100644 board/atmel/at91sam9rlek/partition.c delete mode 100644 board/esd/meesc/partition.c delete mode 100644 board/ronetix/pm9261/partition.c delete mode 100644 board/ronetix/pm9263/partition.c (limited to 'board') diff --git a/board/atmel/at91sam9260ek/Makefile b/board/atmel/at91sam9260ek/Makefile index 07c6184..ad95928 100644 --- a/board/atmel/at91sam9260ek/Makefile +++ b/board/atmel/at91sam9260ek/Makefile @@ -11,4 +11,3 @@ obj-y += at91sam9260ek.o obj-$(CONFIG_AT91_LED) += led.o -obj-$(CONFIG_HAS_DATAFLASH) += partition.o diff --git a/board/atmel/at91sam9260ek/partition.c b/board/atmel/at91sam9260ek/partition.c deleted file mode 100644 index e41eefe..0000000 --- a/board/atmel/at91sam9260ek/partition.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * (C) Copyright 2008 - * Ulf Samuelsson - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#include -#include -#include -#include - -AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS]; - -struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = { - {CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ - {CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1, 1} -}; - -/*define the area offsets*/ -dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { - {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"}, - {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"}, - {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"}, - {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"}, - {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"}, -}; diff --git a/board/atmel/at91sam9261ek/Makefile b/board/atmel/at91sam9261ek/Makefile index d7ba153..1e807ec 100644 --- a/board/atmel/at91sam9261ek/Makefile +++ b/board/atmel/at91sam9261ek/Makefile @@ -11,4 +11,3 @@ obj-y += at91sam9261ek.o obj-$(CONFIG_AT91_LED) += led.o -obj-$(CONFIG_HAS_DATAFLASH) += partition.o diff --git a/board/atmel/at91sam9261ek/partition.c b/board/atmel/at91sam9261ek/partition.c deleted file mode 100644 index ed97609..0000000 --- a/board/atmel/at91sam9261ek/partition.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * (C) Copyright 2008 - * Ulf Samuelsson - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#include -#include -#include -#include - -AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS]; - -struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = { - {CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ - {CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3, 3} -}; - -/*define the area offsets*/ -dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { - {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"}, - {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"}, - {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"}, - {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"}, - {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"}, -}; diff --git a/board/atmel/at91sam9263ek/Makefile b/board/atmel/at91sam9263ek/Makefile index f3cd9d5..b7a30ee 100644 --- a/board/atmel/at91sam9263ek/Makefile +++ b/board/atmel/at91sam9263ek/Makefile @@ -11,4 +11,3 @@ obj-y += at91sam9263ek.o obj-$(CONFIG_AT91_LED) += led.o -obj-$(CONFIG_HAS_DATAFLASH) += partition.o diff --git a/board/atmel/at91sam9263ek/partition.c b/board/atmel/at91sam9263ek/partition.c deleted file mode 100644 index 8617f48..0000000 --- a/board/atmel/at91sam9263ek/partition.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * (C) Copyright 2008 - * Ulf Samuelsson - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#include -#include -#include -#include - -AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS]; - -struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = { - {CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ -}; - -/*define the area offsets*/ -dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { - {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"}, - {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"}, - {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"}, - {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"}, - {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"}, -}; diff --git a/board/atmel/at91sam9rlek/Makefile b/board/atmel/at91sam9rlek/Makefile index 7acfee5..89f6c08 100644 --- a/board/atmel/at91sam9rlek/Makefile +++ b/board/atmel/at91sam9rlek/Makefile @@ -11,4 +11,3 @@ obj-y += at91sam9rlek.o obj-$(CONFIG_AT91_LED) += led.o -obj-$(CONFIG_HAS_DATAFLASH) += partition.o diff --git a/board/atmel/at91sam9rlek/partition.c b/board/atmel/at91sam9rlek/partition.c deleted file mode 100644 index 8617f48..0000000 --- a/board/atmel/at91sam9rlek/partition.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * (C) Copyright 2008 - * Ulf Samuelsson - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#include -#include -#include -#include - -AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS]; - -struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = { - {CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ -}; - -/*define the area offsets*/ -dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { - {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"}, - {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"}, - {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"}, - {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"}, - {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"}, -}; diff --git a/board/esd/meesc/Makefile b/board/esd/meesc/Makefile index 5d16738..f3bf05d 100644 --- a/board/esd/meesc/Makefile +++ b/board/esd/meesc/Makefile @@ -10,4 +10,3 @@ # obj-y += meesc.o -obj-$(CONFIG_HAS_DATAFLASH) += partition.o diff --git a/board/esd/meesc/partition.c b/board/esd/meesc/partition.c deleted file mode 100644 index b6afafc..0000000 --- a/board/esd/meesc/partition.c +++ /dev/null @@ -1,23 +0,0 @@ -/* - * (C) Copyright 2008 - * Ulf Samuelsson - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#include -#include -#include -#include - -AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS]; - -struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = { - {CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ -}; - -/* define the area offsets */ -dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { - {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"}, - {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"}, - {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"}, -}; diff --git a/board/mini-box/picosam9g45/picosam9g45.c b/board/mini-box/picosam9g45/picosam9g45.c index 09ec247..f3263eb 100644 --- a/board/mini-box/picosam9g45/picosam9g45.c +++ b/board/mini-box/picosam9g45/picosam9g45.c @@ -261,9 +261,6 @@ int board_init(void) #ifdef CONFIG_CMD_USB picosam9g45_usb_hw_init(); #endif -#ifdef CONFIG_HAS_DATAFLASH - at91_spi0_hw_init(1 << 0); -#endif #ifdef CONFIG_ATMEL_SPI at91_spi0_hw_init(1 << 4); #endif diff --git a/board/ronetix/pm9261/Makefile b/board/ronetix/pm9261/Makefile index 90835d3..a133b07 100644 --- a/board/ronetix/pm9261/Makefile +++ b/board/ronetix/pm9261/Makefile @@ -12,4 +12,3 @@ obj-y += pm9261.o obj-$(CONFIG_RED_LED) += led.o -obj-$(CONFIG_HAS_DATAFLASH) += partition.o diff --git a/board/ronetix/pm9261/partition.c b/board/ronetix/pm9261/partition.c deleted file mode 100644 index 23ab8cf..0000000 --- a/board/ronetix/pm9261/partition.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * (C) Copyright 2008 - * Ulf Samuelsson - * Ilko Iliev - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#include -#include -#include -#include - -AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS]; - -struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = { - {CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ -}; - -/*define the area offsets*/ -#ifdef CONFIG_SYS_USE_DATAFLASH -dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { - {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"}, - {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"}, - {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"}, - {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"}, - {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"}, -}; -#else -dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { - {0x00000000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, ""}, -}; - -#endif diff --git a/board/ronetix/pm9263/Makefile b/board/ronetix/pm9263/Makefile index 53e621d..72aa107 100644 --- a/board/ronetix/pm9263/Makefile +++ b/board/ronetix/pm9263/Makefile @@ -12,4 +12,3 @@ obj-y += pm9263.o obj-$(CONFIG_AT91_LED) += led.o -obj-$(CONFIG_HAS_DATAFLASH) += partition.o diff --git a/board/ronetix/pm9263/partition.c b/board/ronetix/pm9263/partition.c deleted file mode 100644 index 9cc4214..0000000 --- a/board/ronetix/pm9263/partition.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * (C) Copyright 2008 - * Ulf Samuelsson - * Ilko Iliev - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#include -#include -#include -#include - -AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS]; - -struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = { - {CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ -}; - -/*define the area offsets*/ -#ifdef CONFIG_SYS_USE_DATAFLASH -dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { - {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"}, - {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"}, - {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"}, - {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"}, - {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"}, -}; -#else -dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { - {0x00000000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, ""}, -}; - -#endif diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c index d4416e6..7240c97 100644 --- a/board/siemens/corvus/board.c +++ b/board/siemens/corvus/board.c @@ -250,9 +250,6 @@ int board_init(void) #ifdef CONFIG_ATMEL_SPI at91_spi0_hw_init(1 << 4); #endif -#ifdef CONFIG_HAS_DATAFLASH - at91_spi0_hw_init(1 << 0); -#endif #ifdef CONFIG_MACB corvus_macb_hw_init(); #endif -- cgit v1.1