AT91 fix and preparation for at91rm9200 readding and at91sam9261
cover AT91 fix and preparation for at91rm9200 readding and at91sam9261
Hi Sascha,
this contain fix up and prepacation for adding at91rm9200 and at91sam9261
please pull
The following changes since commit c52f80cc89e559ade702486d03bb8bfe3113db6c:
Add missing include (2010-08-22 12:08:10 +0200)
are available in the git repository at:
git://git.jcrosoft.org/barebox.git at91
Jean-Christophe PLAGNIOL-VILLARD (5):
mmccpu: fix typo in AT91_MAIN_CLOCK
dm9000: allow to specify that no srom is present
at91: rename clocksource.c -> at91sam926x_time.c
macb: introduce HAS_MACB configuration
at91: remove non used and obsolete at91rm9200 code
arch/arm/Kconfig | 5 -
arch/arm/Makefile | 1 -
arch/arm/boards/mmccpu/config.h | 2 +-
arch/arm/boards/scb9328/scb9328.c | 1 +
arch/arm/mach-at91/Kconfig | 2 +
arch/arm/mach-at91/Makefile | 6 +-
.../{clocksource.c => at91sam926x_time.c} | 0
arch/arm/mach-at91rm9200/Kconfig | 16 -
arch/arm/mach-at91rm9200/include/mach/AT91RM9200.h | 762 --------------------
arch/arm/mach-at91rm9200/include/mach/hardware.h | 78 --
drivers/net/Kconfig | 5 +-
drivers/net/dm9000.c | 3 +-
include/dm9000.h | 1 +
13 files changed, 14 insertions(+), 868 deletions(-)
rename arch/arm/mach-at91/{clocksource.c => at91sam926x_time.c} (100%)
delete mode 100644 arch/arm/mach-at91rm9200/Kconfig
delete mode 100644 arch/arm/mach-at91rm9200/include/mach/AT91RM9200.h
delete mode 100644 arch/arm/mach-at91rm9200/include/mach/hardware.h_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
PATCH 1/5 mmccpu: fix typo in AT91_MAIN_CLOCK
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
--- arch/arm/boards/mmccpu/config.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/boards/mmccpu/config.h +1 -1
@@ -1,7 +1,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#define AT91_M1IN_CLOCK 18432000 +#define AT91_MAIN_CLOCK 18432000/* values */ #define MASTER_PLL_MUL 54
Signature · 7 lines
1.7.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/5 dm9000: allow to specify that no srom is present
In reply to Jean-Christophe PLAGNIOL-VILLARDSigned-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
--- arch/arm/boards/scb9328/scb9328.c | 1 + drivers/net/dm9000.c | 3 ++- include/dm9000.h | 1 + 3 files changed, 4 insertions(+), 1 deletions(-)
arch/arm/boards/scb9328/scb9328.c +1 -0
@@ -55,6 +55,7 @@ static struct dm9000_platform_data dm9000_data = { .iobase = 0x16000000, .iodata = 0x16000004, .buswidth =DM9000_WIDTH_16 , + .srom = 1; };static struct device_d dm9000_dev = {
drivers/net/dm9000.c +2 -1
@@ -498,8 +498,9 @@ static int dm9000_probe(struct device_d *dev) edev->send = dm9000_eth_send; edev->recv = dm9000_eth_rx; edev->halt = dm9000_eth_halt; - edev->get_ethaddr = dm9000_get_ethaddr; edev->set_ethaddr = dm9000_set_ethaddr; +if (pdata->srom) + edev->get_ethaddr = dm9000_get_ethaddr;/* RESET device */ dm9000_reset (priv);
include/dm9000.h +1 -0
@@ -10,6 +10,7 @@ struct dm9000_platform_data {unsigned long iobase;unsigned long iodata;int buswidth; + int srom; };#endif /* __DM9000_H__ */
Signature · 7 lines
1.7.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 3/5 at91: rename clocksource.c -> at91sam926x_time.c
In reply to Jean-Christophe PLAGNIOL-VILLARDpreparation to move the rm9200 to the same api as other at91
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
--- arch/arm/mach-at91/Makefile | 6 +- arch/arm/mach-at91/at91sam926x_time.c | 85 +++++++++++++++++++++++++++++++++ arch/arm/mach-at91/clocksource.c | 85 --------------------------------- 3 files changed, 88 insertions(+), 88 deletions(-) create mode 100644 arch/arm/mach-at91/at91sam926x_time.c delete mode 100644 arch/arm/mach-at91/clocksource.c
arch/arm/mach-at91/Makefile +3 -3
@@ -1,7 +1,7 @@ -obj-y += clock.o clocksource.o gpio.o +obj-y += clock.o gpio.o obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel_init.o # CPU-specific support -obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260.o at91sam9260_devices.o sam9_smc.o -obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam9263_devices.o sam9_smc.o +obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o +obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o sam9_smc.o
arch/arm/mach-at91/at91sam926x_time.c new file +85 -0
85 lines not on this page · raw message
arch/arm/mach-at91/clocksource.c deleted +0 -85
85 lines not on this page · raw message
Signature · 7 lines
1.7.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 4/5 macb: introduce HAS_MACB configuration
In reply to Jean-Christophe PLAGNIOL-VILLARDSigned-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
--- arch/arm/mach-at91/Kconfig | 2 ++ drivers/net/Kconfig | 5 ++++- 2 files changed, 6 insertions(+), 1 deletions(-)
arch/arm/mach-at91/Kconfig +2 -0
@@ -18,11 +18,13 @@ choice config ARCH_AT91SAM9260 bool "AT91SAM9260" select CPU_ARM926T + select HAS_MACB config ARCH_AT91SAM9263 bool "AT91SAM9263" select CPU_ARM926T select MACH_HAS_LOWLEVEL_INIT + select HAS_MACB endchoice
drivers/net/Kconfig +4 -1
@@ -4,6 +4,9 @@ config HAS_CS8900 config HAS_DM9000 bool +config HAS_MACB + bool + config HAS_AT91_ETHER bool
@@ -71,7 +74,7 @@ config DRIVER_NET_EP93XX config DRIVER_NET_MACB bool "macb Ethernet driver" - depends on ARCH_AT91 + depends on HAS_MACB select MIIPHY config DRIVER_NET_TAP
Signature · 7 lines
1.7.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 5/5 at91: remove non used and obsolete at91rm9200 code
In reply to Jean-Christophe PLAGNIOL-VILLARDthis will be re-add as mach-at91
for now on keep the net driver which will be updated to new API
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
--- arch/arm/Kconfig | 5 - arch/arm/Makefile | 1 - arch/arm/mach-at91rm9200/Kconfig | 16 - arch/arm/mach-at91rm9200/include/mach/AT91RM9200.h | 762 -------------------- arch/arm/mach-at91rm9200/include/mach/hardware.h | 78 -- 5 files changed, 0 insertions(+), 862 deletions(-) delete mode 100644 arch/arm/mach-at91rm9200/Kconfig delete mode 100644 arch/arm/mach-at91rm9200/include/mach/AT91RM9200.h delete mode 100644 arch/arm/mach-at91rm9200/include/mach/hardware.h
arch/arm/Kconfig +0 -5
@@ -30,10 +30,6 @@ config ARCH_AT91 bool "Atmel AT91" select GENERIC_GPIO -config ARCH_AT91RM9200 - bool "Atmel AT91RM9200" - select CPU_ARM920T - config ARCH_EP93XX bool "Cirrus Logic EP93xx" select CPU_ARM920T
@@ -65,7 +61,6 @@ endchoice source arch/arm/common/Kconfig source arch/arm/cpu/Kconfig source arch/arm/mach-at91/Kconfig -source arch/arm/mach-at91rm9200/Kconfig source arch/arm/mach-ep93xx/Kconfig source arch/arm/mach-imx/Kconfig source arch/arm/mach-netx/Kconfig
arch/arm/Makefile +0 -1
@@ -39,7 +39,6 @@ CPPFLAGS += $(CFLAGS_ABI) $(arch-y) $(tune-y) # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) := at91 -machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200 machine-$(CONFIG_ARCH_EP93XX) := ep93xx machine-$(CONFIG_ARCH_IMX) := imx machine-$(CONFIG_ARCH_NOMADIK) := nomadik
arch/arm/mach-at91rm9200/Kconfig deleted +0 -16
@@ -1,16 +0,0 @@ -if ARCH_AT91RM9200 - -config ARCH_TEXT_BASE - hex - -config BOARDINFO - -comment "Atmel AT91RM9200 System-on-Chip" - -choice - - prompt "AT91RM9200 Board Type" - -endchoice - -endif
arch/arm/mach-at91rm9200/include/mach/AT91RM9200.h deleted +0 -762
762 lines not on this page · raw message
arch/arm/mach-at91rm9200/include/mach/hardware.h deleted +0 -78
78 lines not on this page · raw message
Signature · 7 lines
1.7.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox