Newer
Older
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
From 7c6a23595bca1aafa33a28e6dda765b89e752861 Mon Sep 17 00:00:00 2001
From: Suhas K <suhas.kunnath@gadgeon.com>
Date: Wed, 25 Apr 2018 16:54:01 +0530
Subject: [PATCH 4/9] Removed redundant environment variable entries
---
include/configs/vesta.h | 56 ++++++++-----------------------------------------
1 file changed, 9 insertions(+), 47 deletions(-)
diff --git a/include/configs/vesta.h b/include/configs/vesta.h
index a88f41d..131c52d 100644
--- a/include/configs/vesta.h
+++ b/include/configs/vesta.h
@@ -81,54 +81,16 @@
#define CONFIG_SYS_I2C_SPEED 100000
/*Configure kernel, device tree and rootfs to be used with dgua*/
+#define CONFIG_KERNEL_LOCATION "2"
+#define CONFIG_FDT_LOCATION "2"
+#define CONFIG_ALT_KERNEL_LOCATION "3"
+#define CONFIG_ALT_FDT_LOCATION "3"
+#define CONFIG_ROOT_FS "root=/dev/mmcblk1p5 rootwait rw"
+#define CONFIG_ALT_ROOT_FS "root=/dev/mmcblk1p6 rootwait rw"
#define CONFIG_DEFAULT_FDT_FILE "DUMMY"
-#ifdef CONFIG_VESTA_100
- #define BOARD_TYPE "vesta-100"
-/* #define CONFIG_DEFAULT_FDT_FILE "zImage-vesta-100.dtb"*/
- #define CONFIG_KERNEL_LOCATION "2"
- #define CONFIG_FDT_LOCATION "2"
- #define CONFIG_ALT_KERNEL_LOCATION "3"
- #define CONFIG_ALT_FDT_LOCATION "3"
- #define CONFIG_ROOT_FS "root=/dev/mmcblk1p5 rootwait rw"
- #define CONFIG_ALT_ROOT_FS "root=/dev/mmcblk1p6 rootwait rw"
-#elif CONFIG_VESTA_200
- #define BOARD_TYPE "vesta-200"
-/* #define CONFIG_DEFAULT_FDT_FILE "zImage-vesta-200.dtb"*/
- #define CONFIG_KERNEL_LOCATION "2"
- #define CONFIG_FDT_LOCATION "2"
- #define CONFIG_ALT_KERNEL_LOCATION "3"
- #define CONFIG_ALT_FDT_LOCATION "3"
- #define CONFIG_ROOT_FS "root=/dev/mmcblk1p5 rootwait rw"
- #define CONFIG_ALT_ROOT_FS "root=/dev/mmcblk1p6 rootwait rw"
-#elif CONFIG_VESTA_300
- #define BOARD_TYPE "vesta-300"
-/* #define CONFIG_DEFAULT_FDT_FILE "zImage-vesta-300.dtb"*/
- #define CONFIG_KERNEL_LOCATION "2"
- #define CONFIG_FDT_LOCATION "2"
- #define CONFIG_ALT_KERNEL_LOCATION "3"
- #define CONFIG_ALT_FDT_LOCATION "3"
- #define CONFIG_ROOT_FS "root=/dev/mmcblk1p5 rootwait rw"
- #define CONFIG_ALT_ROOT_FS "root=/dev/mmcblk1p6 rootwait rw"
-#elif CONFIG_VESTA_400
- #define BOARD_TYPE "vesta-400"
-/* #define CONFIG_DEFAULT_FDT_FILE "zImage-vesta-400.dtb"*/
- #define CONFIG_KERNEL_LOCATION "2"
- #define CONFIG_FDT_LOCATION "2"
- #define CONFIG_ALT_KERNEL_LOCATION "3"
- #define CONFIG_ALT_FDT_LOCATION "3"
- #define CONFIG_ROOT_FS "root=/dev/mmcblk1p5 rootwait rw"
- #define CONFIG_ALT_ROOT_FS "root=/dev/mmcblk1p6 rootwait rw"
-#elif CONFIG_VESTA_500
- #define BOARD_TYPE "vesta-500"
-/* #define CONFIG_DEFAULT_FDT_FILE "zImage-vesta-500.dtb"*/
- #define CONFIG_KERNEL_LOCATION "2"
- #define CONFIG_FDT_LOCATION "2"
- #define CONFIG_ALT_KERNEL_LOCATION "3"
- #define CONFIG_ALT_FDT_LOCATION "3"
- #define CONFIG_ROOT_FS "root=/dev/mmcblk1p5 rootwait rw"
- #define CONFIG_ALT_ROOT_FS "root=/dev/mmcblk1p6 rootwait rw"
-#elif CONFIG_VESTA_64M_NOR
- #define BOARD_TYPE "vesta-nor"
+
+#if CONFIG_VESTA_64M_NOR
+/* #define BOARD_TYPE "vesta-nor"*/
/* #define CONFIG_DEFAULT_FDT_FILE "zImage-vesta-64M-nor.dtb"*/
#define CONFIG_KERNEL_LOCATION "0x110000"
#define CONFIG_FDT_LOCATION "0x100000"
--
2.7.4