From fa938c7508627c0dfcf03960957ef8631fc53f02 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Thu, 29 Aug 2013 14:17:36 -0700 Subject: exynos5: Refactor crazy old U-Boot base address macros away All this samsung_get_base_address_of_device_with_a_really_long_name() boilerplate makes my eyes bleed... I think there are so much cleaner ways to do this. Unfortunately changing this ends up touching nearly every Exynos5 file, but I hope you agree that it's worth it (and the sooner we get it over with, the better... I can't bring myself to make another device fit into that ugly scheme). This also removes the redundant EXYNOS5 base address definitions from the 5420 directory when there are EXYNOS5420 ones, to avoid complete confusion. The new scheme tries to use EXYNOS5 for base addresses and exynos5 for types that are common between the two processors, and EXYNOS5420/exynos5420 for things that have changes (although I probably didn't catch all differences). Change-Id: I87e58434490ed55a9bbe743af1f9bf2520dec13f Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/167579 Reviewed-by: Stefan Reinauer Reviewed-by: David Hendricks Reviewed-by: ron minnich (cherry picked from commit 66c87693352c248eec029c1ce83fb295059e6b5b) Signed-off-by: Isaac Christensen Reviewed-on: http://review.coreboot.org/6632 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich Reviewed-by: Edward O'Callaghan Reviewed-by: Paul Menzel --- src/mainboard/google/pit/mainboard.c | 1 - src/mainboard/google/snow/mainboard.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/google/pit/mainboard.c b/src/mainboard/google/pit/mainboard.c index 467b9d04e9..bdf2d571b2 100644 --- a/src/mainboard/google/pit/mainboard.c +++ b/src/mainboard/google/pit/mainboard.c @@ -331,7 +331,6 @@ static struct edp_video_info dp_video_info = { }; /* FIXME: move some place more appropriate */ -#define EXYNOS5420_DP1_BASE 0x145b0000 #define MAX_DP_TRIES 5 static void setup_storage(void) diff --git a/src/mainboard/google/snow/mainboard.c b/src/mainboard/google/snow/mainboard.c index dfaf81d537..756dc15325 100644 --- a/src/mainboard/google/snow/mainboard.c +++ b/src/mainboard/google/snow/mainboard.c @@ -30,11 +30,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include "exynos5250.h" @@ -193,7 +193,6 @@ static struct video_info dp_video_info = { }; /* FIXME: move some place more appropriate */ -#define EXYNOS5250_DP1_BASE 0x145b0000 #define MAX_DP_TRIES 5 /* @@ -256,7 +255,7 @@ static void mainboard_init(device_t dev) { int dp_tries; struct s5p_dp_device dp_device = { - .base = (struct exynos5_dp *)EXYNOS5250_DP1_BASE, + .base = exynos_dp1, .video_info = &dp_video_info, }; void *fb_addr = (void *)(get_fb_base_kb() * KiB); -- cgit v1.2.3