Sascha Hauer
40c6d8aee4
ARM: 7022/1: allow to detect conflicting zreladdrs
...
Boards used to specify zreladdr in their Makefile.boot with
zreladdr-y := x, so conflicting zreladdrs were silently overwritten.
This patch changes this to zreladdr-y += x, so that we end
up with multiple words in zreladdr in such a case. We can
detect this later and complain if necessary.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2011-10-17 09:12:40 +01:00
..
2011-07-26 17:12:10 -07:00
2011-06-20 01:25:39 -07:00
2011-07-04 18:43:43 +03:00
2011-06-20 01:25:39 -07:00
2011-07-26 17:42:18 -07:00
2011-08-10 04:54:48 -07:00
2011-06-20 01:25:39 -07:00
2011-06-20 01:25:39 -07:00
2011-07-11 23:53:01 +02:00
2011-06-29 03:35:18 -07:00
2011-07-04 18:43:43 +03:00
2011-06-29 01:11:37 -07:00
2011-02-17 15:32:52 -08:00
2011-06-30 12:58:01 +00:00
2011-06-20 01:25:39 -07:00
2011-07-04 18:43:43 +03:00
2011-07-04 18:43:38 +03:00
2011-06-20 01:25:39 -07:00
2011-08-05 11:54:58 -07:00
2011-07-04 18:43:43 +03:00
2011-06-29 03:35:18 -07:00
2011-07-04 18:43:43 +03:00
2011-07-04 18:43:43 +03:00
2011-07-04 18:43:43 +03:00
2011-07-04 18:43:33 +03:00
2011-07-11 23:53:01 +02:00
2011-07-04 18:43:38 +03:00
2011-07-30 00:08:53 -07:00
2011-05-26 12:11:54 -07:00
2011-06-20 01:25:39 -07:00
2011-06-20 01:25:39 -07:00
2011-07-04 04:11:08 -07:00
2011-05-31 06:17:02 -07:00
2011-07-04 18:44:02 +03:00
2011-06-20 01:25:39 -07:00
2011-03-07 20:02:13 -07:00
2011-03-07 20:02:05 -07:00
2010-12-21 21:05:14 -07:00
2011-03-07 20:02:21 -07:00
2010-12-21 20:01:55 -07:00
2010-12-21 21:05:14 -07:00
2011-05-13 07:08:18 -07:00
2011-02-16 17:49:35 -08:00
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024
2011-03-10 22:41:28 -07:00
2011-03-07 20:03:12 -07:00
2010-02-24 17:45:15 -07:00
2011-03-09 18:44:28 -07:00
2011-07-10 05:54:12 -06:00
2011-02-25 16:10:42 -07:00
2010-02-24 12:16:15 -07:00
2011-03-07 20:04:03 -07:00
2011-03-07 20:04:03 -07:00
2010-02-24 12:16:15 -07:00
2010-02-24 12:16:15 -07:00
2011-07-26 17:42:18 -07:00
2011-07-09 19:14:46 -06:00
2011-07-10 05:54:12 -06:00
2011-07-10 05:54:12 -06:00
2010-12-21 20:01:55 -07:00
2011-03-07 20:04:03 -07:00
2010-02-24 12:16:15 -07:00
2011-03-07 20:21:17 -07:00
2011-07-26 17:42:18 -07:00
2011-07-10 05:57:06 -06:00
2011-07-10 05:56:55 -06:00
2011-07-10 05:56:55 -06:00
2011-07-10 05:56:55 -06:00
2011-07-10 05:56:55 -06:00
2011-03-07 20:21:17 -07:00
2011-07-10 05:56:29 -06:00
2011-07-09 19:15:05 -06:00
2011-07-09 19:15:05 -06:00
2011-04-20 12:43:56 -06:00
2011-03-07 20:02:13 -07:00
2010-12-21 21:05:14 -07:00
2011-07-10 05:56:30 -06:00
2011-03-07 20:02:57 -07:00
2010-12-21 21:05:15 -07:00
2011-07-26 17:09:31 -07:00
2010-12-21 20:01:55 -07:00
2011-07-10 05:56:32 -06:00
2011-08-10 02:20:43 -07:00
2011-07-04 18:43:27 +03:00
2011-07-04 18:43:27 +03:00
2011-03-10 18:54:14 -08:00
2011-06-24 09:54:31 +01:00
2011-06-24 09:54:31 +01:00
2011-05-20 17:15:54 +02:00
2011-07-05 03:38:24 -07:00
2011-03-22 04:53:42 -03:00
2011-07-25 10:22:06 +03:00
2011-03-31 11:26:23 -03:00
2011-01-06 19:13:58 -08:00
2011-02-25 16:10:17 -07:00
2010-12-21 21:05:14 -07:00
2010-02-15 09:27:05 -08:00
2011-07-22 16:01:57 -07:00
2011-06-29 01:11:37 -07:00
2011-02-17 15:44:46 -08:00
2011-05-12 02:52:06 -07:00
2011-05-12 02:52:06 -07:00
2011-03-29 14:47:57 +02:00
2011-07-04 04:11:08 -07:00
2011-06-01 02:25:04 -07:00
2011-02-17 09:52:43 -08:00
2011-07-10 05:27:16 -06:00
2011-07-08 02:11:45 -07:00
2011-06-16 05:42:09 -07:00
2010-10-08 10:12:38 -07:00
2011-07-04 15:07:45 +03:00
2011-06-16 05:42:09 -07:00
2011-08-05 11:54:53 -07:00
2011-03-10 18:54:14 -08:00
2011-07-09 19:14:07 -06:00
2011-10-17 09:12:40 +01:00
2011-03-31 11:26:23 -03:00
2011-01-06 19:58:28 -08:00
2009-12-11 16:16:33 -08:00
2011-06-01 02:25:04 -07:00
2010-11-17 12:01:52 +01:00
2010-11-17 12:01:54 +01:00
2010-07-05 16:31:36 +03:00
2010-11-17 12:01:54 +01:00
2011-03-31 11:26:23 -03:00
2011-08-10 04:53:28 -07:00
2011-06-01 02:25:04 -07:00
2011-06-16 05:42:09 -07:00
2011-03-09 16:38:36 -08:00
2011-07-09 19:14:06 -06:00
2011-07-09 19:14:08 -06:00
2011-07-09 19:14:06 -06:00
2011-07-09 19:14:08 -06:00
2011-07-10 05:27:16 -06:00
2011-07-10 05:56:32 -06:00
2011-07-10 05:27:16 -06:00
2011-07-10 05:27:16 -06:00
2011-07-09 19:14:07 -06:00
2011-07-09 19:14:08 -06:00
2011-07-10 05:57:07 -06:00
2011-05-03 02:38:01 -07:00
2011-03-09 17:23:58 +05:30
2011-05-17 03:44:50 -07:00
2011-03-09 17:23:57 +05:30
2011-03-10 22:17:45 -07:00
2011-06-01 02:25:04 -07:00
2011-03-31 11:26:23 -03:00
2011-03-09 16:38:36 -08:00
2010-12-20 15:09:10 +00:00
2011-07-04 15:08:06 +03:00
2011-07-07 14:45:07 +01:00
2011-01-27 16:39:40 -08:00
2011-03-11 09:39:58 -08:00
2011-03-11 09:39:58 -08:00
2010-01-08 15:23:15 -07:00
2010-01-08 15:23:15 -07:00
2010-12-21 14:30:40 -08:00
2011-06-20 14:12:32 -07:00
2011-07-25 12:38:42 -07:00
2011-05-03 02:38:03 -07:00
2011-06-29 04:45:16 -07:00
2011-07-10 05:56:54 -06:00
2011-07-25 12:38:42 -07:00
2011-01-18 12:36:53 -07:00
2010-12-21 21:05:16 -07:00
2010-12-21 21:05:16 -07:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-03-07 19:28:15 -07:00
2010-12-21 21:05:16 -07:00
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024
2011-03-10 22:41:28 -07:00
2011-03-31 11:26:23 -03:00
2011-07-10 05:44:23 -06:00
2010-12-21 21:05:14 -07:00
2010-12-21 21:05:14 -07:00
2011-07-09 19:15:06 -06:00
2011-03-02 17:11:18 -08:00
2011-07-10 05:56:31 -06:00
2011-03-10 03:23:56 -07:00
2011-03-10 03:23:56 -07:00
2011-07-10 05:56:31 -06:00
2011-07-10 05:56:31 -06:00
2010-12-21 20:01:55 -07:00
2010-12-21 20:01:55 -07:00
2011-07-08 02:18:24 -07:00
2010-12-21 20:01:55 -07:00
2011-07-10 05:56:31 -06:00
2011-07-10 05:56:31 -06:00
2010-12-21 20:01:54 -07:00
2009-11-22 10:24:33 -08:00
2009-10-20 09:40:47 -07:00
2010-12-17 15:13:46 -08:00
2010-12-17 15:13:44 -08:00
2010-02-17 17:23:20 -08:00
2009-10-20 09:40:47 -07:00
2010-12-21 21:05:14 -07:00
2010-12-21 20:01:55 -07:00
2010-12-21 14:45:56 -08:00
2011-07-12 22:48:42 +02:00
2011-02-04 14:26:08 +00:00
2011-06-30 08:47:35 +01:00
2011-03-07 20:05:08 -07:00
2011-08-05 11:54:59 -07:00
2011-03-07 20:05:08 -07:00
2011-03-07 20:05:08 -07:00
2011-03-17 19:28:15 -07:00
2011-02-04 14:26:08 +00:00
2011-02-04 14:26:08 +00:00
2011-02-23 17:54:55 +00:00
2011-08-10 07:36:45 -07:00
2011-08-10 02:09:19 -07:00
2011-07-04 18:43:43 +03:00
2010-10-08 11:40:20 -06:00
2011-03-01 17:02:44 +02:00
2011-07-01 14:31:14 -07:00
2011-05-12 02:52:06 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-05-17 03:44:50 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-01-06 19:58:28 -08:00
2010-12-21 19:56:17 -07:00