diff options
author | Wolfgang Denk <wd@denx.de> | 2011-11-28 19:57:38 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-11-28 19:57:38 +0100 |
commit | 68435fa1519cb92493fd59e05bc9dbe7f2205feb (patch) | |
tree | c9f8c096f08608c1307e8ea59f061b265c6ebb66 /include | |
parent | d5251742a7b2465c8de2841bc7db5a1e059c13a3 (diff) | |
parent | 623e03256e222b42fb86fd81fafe508e3cb569a4 (diff) | |
download | u-boot-imx-68435fa1519cb92493fd59e05bc9dbe7f2205feb.zip u-boot-imx-68435fa1519cb92493fd59e05bc9dbe7f2205feb.tar.gz u-boot-imx-68435fa1519cb92493fd59e05bc9dbe7f2205feb.tar.bz2 |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
MAKEALL: drop obsolete mx31pdk_nand target
dataflash: fix parameters order in write_dataflash()
hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines
davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board
davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board
arm: a320evb: define mach-type in board config file
OMAP3: Use sdelay from arch/arm/cpu/armv7/syslib.c instead of cloning that.
Fix Stelian's email address
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/a320evb.h | 6 | ||||
-rw-r--r-- | include/configs/at91sam9260ek.h | 2 | ||||
-rw-r--r-- | include/configs/at91sam9261ek.h | 2 | ||||
-rw-r--r-- | include/configs/at91sam9263ek.h | 2 | ||||
-rw-r--r-- | include/configs/at91sam9m10g45ek.h | 2 | ||||
-rw-r--r-- | include/configs/at91sam9rlek.h | 2 | ||||
-rw-r--r-- | include/configs/cpu9260.h | 2 | ||||
-rw-r--r-- | include/configs/davinci_schmoogie.h | 3 | ||||
-rw-r--r-- | include/configs/davinci_sonata.h | 2 | ||||
-rw-r--r-- | include/configs/meesc.h | 2 | ||||
-rw-r--r-- | include/configs/otc570.h | 2 | ||||
-rw-r--r-- | include/configs/pm9261.h | 2 | ||||
-rw-r--r-- | include/configs/pm9263.h | 2 | ||||
-rw-r--r-- | include/configs/pm9g45.h | 2 | ||||
-rw-r--r-- | include/configs/tny_a9260.h | 2 | ||||
-rw-r--r-- | include/dataflash.h | 3 |
16 files changed, 25 insertions, 13 deletions
diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h index 45a7c53..1fafbed 100644 --- a/include/configs/a320evb.h +++ b/include/configs/a320evb.h @@ -25,6 +25,12 @@ #include <asm/arch/a320.h> /* + * mach-type definition + */ +#define MACH_TYPE_FARADAY 758 +#define CONFIG_MACH_TYPE MACH_TYPE_FARADAY + +/* * Linux kernel tagged list */ #define CONFIG_CMDLINE_TAG diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index c439f3e..db52ee6 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * * Configuation settings for the AT91SAM9260EK & AT91SAM9G20EK boards. diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index c8fc9e7..5140b26 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * * Configuation settings for the AT91SAM9261EK board. diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index f73d952..8399246 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * * Configuation settings for the AT91SAM9263EK board. diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 05575cd..5ef6bd2 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * * Configuation settings for the AT91SAM9M10G45EK board(and AT91SAM9G45EKES). diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 3ca09e1..79ea1f2 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * * Configuation settings for the AT91SAM9RLEK board. diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h index 0c86d62..8674a35 100644 --- a/include/configs/cpu9260.h +++ b/include/configs/cpu9260.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * Ilko Iliev <www.ronetix.at> * diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h index 5eaa198..f4ddbeac 100644 --- a/include/configs/davinci_schmoogie.h +++ b/include/configs/davinci_schmoogie.h @@ -27,6 +27,9 @@ #define CONFIG_SYS_NAND_LARGEPAGE #define CONFIG_SYS_USE_NAND #define CONFIG_DISPLAY_CPUINFO +#define MACH_TYPE_SCHMOOGIE 1255 +#define CONFIG_MACH_TYPE MACH_TYPE_SCHMOOGIE + /*===================*/ /* SoC Configuration */ /*===================*/ diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h index 74530e8..fc4d8ec 100644 --- a/include/configs/davinci_sonata.h +++ b/include/configs/davinci_sonata.h @@ -52,6 +52,8 @@ #define CONFIG_SYS_NAND_SMALLPAGE #define CONFIG_SYS_USE_NOR #define CONFIG_DISPLAY_CPUINFO +#define MACH_TYPE_SONATA 1254 +#define CONFIG_MACH_TYPE MACH_TYPE_SONATA /*===================*/ /* SoC Configuration */ /*===================*/ diff --git a/include/configs/meesc.h b/include/configs/meesc.h index ea40290..d6197bc 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * * (C) Copyright 2009-2011 diff --git a/include/configs/otc570.h b/include/configs/otc570.h index c068aa0..b322c77 100644 --- a/include/configs/otc570.h +++ b/include/configs/otc570.h @@ -4,7 +4,7 @@ * esd electronic system design gmbh <www.esd.eu> * * (C) Copyright 2007-2008 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * * Configuation settings for the esd OTC570 board. diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 55455e7..9fbf9af 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * Ilko Iliev <www.ronetix.at> * diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 43104a3..374be27 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * Ilko Iliev <www.ronetix.at> * diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index d3beaf3..5b08d91 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -5,7 +5,7 @@ * Ronetix GmbH <www.ronetix.at> * * (C) Copyright 2007-2008 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * * Configuation settings for the PM9G45 board. diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h index 986aeba..ec8ec18 100644 --- a/include/configs/tny_a9260.h +++ b/include/configs/tny_a9260.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * * Copyright (C) 2009 diff --git a/include/dataflash.h b/include/dataflash.h index 056e18b..94f86b3 100644 --- a/include/dataflash.h +++ b/include/dataflash.h @@ -207,7 +207,8 @@ extern int addr2ram(ulong addr); extern int dataflash_real_protect (int flag, unsigned long start_addr, unsigned long end_addr); extern int addr_dataflash (unsigned long addr); extern int read_dataflash (unsigned long addr, unsigned long size, char *result); -extern int write_dataflash (unsigned long addr, unsigned long dest, unsigned long size); +extern int write_dataflash(unsigned long addr_dest, unsigned long addr_src, + unsigned long size); extern int AT91F_DataflashInit(void); extern void dataflash_print_info (void); |