From 762e63754b6417126260dd22631d0e3bda12eb70 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Tue, 1 Nov 2011 00:00:39 +0100 Subject: Fix Stelian's email address Change my old email address which is no longer valid. Signed-off-by: Stelian Pop Signed-off-by: Anatolij Gustschin --- include/configs/at91sam9260ek.h | 2 +- include/configs/at91sam9261ek.h | 2 +- include/configs/at91sam9263ek.h | 2 +- include/configs/at91sam9m10g45ek.h | 2 +- include/configs/at91sam9rlek.h | 2 +- include/configs/cpu9260.h | 2 +- include/configs/meesc.h | 2 +- include/configs/otc570.h | 2 +- include/configs/pm9261.h | 2 +- include/configs/pm9263.h | 2 +- include/configs/pm9g45.h | 2 +- include/configs/tny_a9260.h | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index c439f3e821d..db52ee66da6 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop + * Stelian Pop * Lead Tech Design * * Configuation settings for the AT91SAM9260EK & AT91SAM9G20EK boards. diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index c8fc9e7bd15..5140b26cdac 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop + * Stelian Pop * Lead Tech Design * * Configuation settings for the AT91SAM9261EK board. diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index f73d952ff83..83992461f90 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop + * Stelian Pop * Lead Tech Design * * Configuation settings for the AT91SAM9263EK board. diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 05575cd34c4..5ef6bd23077 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop + * Stelian Pop * Lead Tech Design * * Configuation settings for the AT91SAM9M10G45EK board(and AT91SAM9G45EKES). diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 3ca09e1438d..79ea1f29a74 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop + * Stelian Pop * Lead Tech Design * * Configuation settings for the AT91SAM9RLEK board. diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h index 0c86d6220de..8674a35d223 100644 --- a/include/configs/cpu9260.h +++ b/include/configs/cpu9260.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop + * Stelian Pop * Lead Tech Design * Ilko Iliev * diff --git a/include/configs/meesc.h b/include/configs/meesc.h index ea402905ba0..d6197bc610a 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop + * Stelian Pop * Lead Tech Design * * (C) Copyright 2009-2011 diff --git a/include/configs/otc570.h b/include/configs/otc570.h index c068aa0153e..b322c775a10 100644 --- a/include/configs/otc570.h +++ b/include/configs/otc570.h @@ -4,7 +4,7 @@ * esd electronic system design gmbh * * (C) Copyright 2007-2008 - * Stelian Pop + * Stelian Pop * Lead Tech Design * * Configuation settings for the esd OTC570 board. diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 55455e7a255..9fbf9afe2fb 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop + * Stelian Pop * Lead Tech Design * Ilko Iliev * diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 43104a3e282..374be27396f 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop + * Stelian Pop * Lead Tech Design * Ilko Iliev * diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index d3beaf300ec..5b08d910976 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -5,7 +5,7 @@ * Ronetix GmbH * * (C) Copyright 2007-2008 - * Stelian Pop + * Stelian Pop * Lead Tech Design * * Configuation settings for the PM9G45 board. diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h index 986aebaae44..ec8ec18ec5b 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 * Lead Tech Design * * Copyright (C) 2009 -- cgit v1.3.1 From 641483af40915dabdfe7764bb22d7e5103cb636b Mon Sep 17 00:00:00 2001 From: Yan-Pai Chen Date: Mon, 7 Nov 2011 19:40:25 +0000 Subject: arm: a320evb: define mach-type in board config file MACH_TYPE_FARADAY was dropped from mach-types.h. Add it back to board config file. Signed-off-by: Yan-Pai Chen Acked-by: Igor Grinberg --- board/faraday/a320evb/a320evb.c | 1 - include/configs/a320evb.h | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/board/faraday/a320evb/a320evb.c b/board/faraday/a320evb/a320evb.c index 2578be4f92c..dfd186ba8a9 100644 --- a/board/faraday/a320evb/a320evb.c +++ b/board/faraday/a320evb/a320evb.c @@ -31,7 +31,6 @@ DECLARE_GLOBAL_DATA_PTR; int board_init(void) { - gd->bd->bi_arch_number = MACH_TYPE_FARADAY; gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; ftsmc020_init(); /* initialize Flash */ diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h index 45a7c53f7d9..1fafbedc9f8 100644 --- a/include/configs/a320evb.h +++ b/include/configs/a320evb.h @@ -24,6 +24,12 @@ #include +/* + * mach-type definition + */ +#define MACH_TYPE_FARADAY 758 +#define CONFIG_MACH_TYPE MACH_TYPE_FARADAY + /* * Linux kernel tagged list */ -- cgit v1.3.1 From ece91e30265764fe4edd61d8c1852d2248e566be Mon Sep 17 00:00:00 2001 From: Christian Riesch Date: Sat, 19 Nov 2011 00:45:42 +0000 Subject: davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board This patch fixes the build breakage for the davinci_schmoogie board. Signed-off-by: Christian Riesch Cc: Sergey Kubushyn Cc: Sandeep Paulraj --- board/davinci/schmoogie/schmoogie.c | 3 --- include/configs/davinci_schmoogie.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/board/davinci/schmoogie/schmoogie.c b/board/davinci/schmoogie/schmoogie.c index 8b615a9929c..52d00e42060 100644 --- a/board/davinci/schmoogie/schmoogie.c +++ b/board/davinci/schmoogie/schmoogie.c @@ -33,9 +33,6 @@ DECLARE_GLOBAL_DATA_PTR; int board_init(void) { - /* arch number of the board */ - gd->bd->bi_arch_number = MACH_TYPE_SCHMOOGIE; - /* address of boot parameters */ gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR; diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h index 5eaa1988467..f4ddbeacc3b 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 */ /*===================*/ -- cgit v1.3.1 From f880fe57948907815cccbcbb6cb2f1984254da0d Mon Sep 17 00:00:00 2001 From: Christian Riesch Date: Sat, 19 Nov 2011 00:45:43 +0000 Subject: davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board This patch fixes the build breakage for the davinci_sonata board. Signed-off-by: Christian Riesch Cc: Sergey Kubushyn Cc: Sandeep Paulraj --- board/davinci/sonata/sonata.c | 3 --- include/configs/davinci_sonata.h | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/board/davinci/sonata/sonata.c b/board/davinci/sonata/sonata.c index c194290c09e..55110fb278c 100644 --- a/board/davinci/sonata/sonata.c +++ b/board/davinci/sonata/sonata.c @@ -34,9 +34,6 @@ DECLARE_GLOBAL_DATA_PTR; int board_init(void) { - /* arch number of the board */ - gd->bd->bi_arch_number = MACH_TYPE_SONATA; - /* address of boot parameters */ gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR; diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h index 74530e8306c..fc4d8eceac3 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 */ /*===================*/ -- cgit v1.3.1 From 85be1e21fcec4f9c1010c4f61e050ae9b0df2bbc Mon Sep 17 00:00:00 2001 From: Igor Grinberg Date: Sat, 26 Nov 2011 23:06:46 +0000 Subject: dataflash: fix parameters order in write_dataflash() Fix parameters order in write_dataflash() function extern declaration in the header file. Parameters order, as in function definition, should be: addr_dest, addr_src, size. Signed-off-by: Igor Grinberg --- include/dataflash.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/dataflash.h b/include/dataflash.h index 056e18b036a..94f86b3a306 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); -- cgit v1.3.1