Commit 36dc2441 authored by David Mondou's avatar David Mondou
Browse files

Rename Vesta-300B to Vesta-500

parent 01cc50eb
......@@ -19,7 +19,7 @@ KERNEL_DEVICETREE = "vesta-100.dtb"
KERNEL_DEVICETREE += "vesta-200.dtb"
KERNEL_DEVICETREE += "vesta-300.dtb"
KERNEL_DEVICETREE += "vesta-400.dtb"
KERNEL_DEVICETREE += "vesta-300B.dtb"
KERNEL_DEVICETREE += "vesta-500.dtb"
KERNEL_DEVICETREE += "310-00110-0003.dtb 310-00121-0001.dtb"
PREFERRED_PROVIDER_u-boot = "u-boot-vesta"
PREFERRED_VERSION_u-boot = "2016.03"
......
......@@ -39,7 +39,7 @@ index ea63de5..ced9f15 100644
-
- ldr r2, =VESTA_300B
- cmp r1, r2
beq v300B
beq v500
-/*OCOTP_GP2 offset 0x670 */
- ldr r1, [r0, #0x670]
......@@ -82,7 +82,7 @@ index e662df1..2fea84b 100644
- else {
- printf ("Board id not recognized\n");
- }
+ puts("Board: Vesta 300B\n");
+ puts("Board: Vesta 500\n");
}
else if (is_cpu_type(MXC_CPU_MX6UL)) {
board_id = readl(OCOTP_GP34);
......@@ -115,8 +115,8 @@ index fd9c587..56ba1cb 100644
- else {
- printf ("Board id not recognized\n");
- }
+ setenv("board_type", "vesta-300B");
+ setenv("fdt_file", "zImage-vesta-300B.dtb");
+ setenv("board_type", "vesta-500");
+ setenv("fdt_file", "zImage-vesta-500.dtb");
}
else if (is_cpu_type(MXC_CPU_MX6UL)) {
board_id = readl(OCOTP_GP34);
......
diff --git a/board/rigado/vesta/plugin.S b/board/rigado/vesta/plugin.S
index f9cdba9..f493c72 100644
--- a/board/rigado/vesta/plugin.S
+++ b/board/rigado/vesta/plugin.S
@@ -22,8 +22,8 @@
#define OCOTP_GP1 0x021bc660
#define OCOTP_GP2 0x021bc670
#define ULL_ID_MASK 0x0FFC0000
-#define VESTA_300B 0x01F80000
-#define VESTA_300B1 0x007c0000
+#define VESTA_500 0x01F80000
+#define VESTA_500_1 0x007c0000
#define MX6ULL_CPU_ID 0x65
/* DDR script */
@@ -384,18 +384,18 @@
ldr r2, =#ULL_ID_MASK
and r1, r1, r2
- ldr r2, =VESTA_300B
+ ldr r2, =VESTA_500
cmp r1, r2
- beq v300B
+ beq v500
/*OCOTP_GP2 offset 0x670 */
ldr r1, [r0, #0x670]
ldr r2, =#ULL_ID_MASK
and r1, r1, r2
- ldr r2, =VESTA_300B1
+ ldr r2, =VESTA_500_1
cmp r1, r2
- beq v300B
+ beq v500
b end
ulcmp:
@@ -442,7 +442,7 @@ v300:
v400:
imx6ul_ddr3_setting_4g
b end
-v300B:
+v500:
imx6ul_ddr3_setting_4g
end:
nop
diff --git a/board/rigado/vesta/vesta.c b/board/rigado/vesta/vesta.c
index 0377831..ac11c74 100644
--- a/board/rigado/vesta/vesta.c
+++ b/board/rigado/vesta/vesta.c
@@ -45,8 +45,8 @@
#define OCOTP_GP1 0x021bc660
#define OCOTP_GP2 0x021bc670
#define ULL_ID_MASK 0x0FFC0000
-#define VESTA_300B 0x01F80000
-#define VESTA_300B1 0x007c0000
+#define VESTA_500 0x01F80000
+#define VESTA_500_1 0x007c0000
#ifdef CONFIG_FSL_FASTBOOT
#include <fsl_fastboot.h>
@@ -636,8 +636,8 @@ int checkboard(void)
if (is_cpu_type(MXC_CPU_MX6ULL)) {
board_id = (readl(OCOTP_GP1) != 0 )?readl(OCOTP_GP1):readl(OCOTP_GP2);
- if (((board_id & ULL_ID_MASK) == VESTA_300B) || ((board_id & ULL_ID_MASK) == VESTA_300B1)) {
- puts("Board: Vesta 300B\n");
+ if (((board_id & ULL_ID_MASK) == VESTA_500) || ((board_id & ULL_ID_MASK) == VESTA_500_1)) {
+ puts("Board: Vesta 500\n");
}
else {
printf ("Board id not recognized\n");
diff --git a/common/cmd_getboard.c b/common/cmd_getboard.c
index 6b1300e..0a012b1 100644
--- a/common/cmd_getboard.c
+++ b/common/cmd_getboard.c
@@ -29,8 +29,8 @@
#define OCOTP_GP1 0x021bc660
#define OCOTP_GP2 0x021bc670
#define ULL_ID_MASK 0x0FFC0000
-#define VESTA_300B 0x01F80000
-#define VESTA_300B1 0x007c0000
+#define VESTA_500 0x01F80000
+#define VESTA_500_1 0x007c0000
DECLARE_GLOBAL_DATA_PTR;
@@ -40,9 +40,9 @@ static int do_getboard(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
if (is_cpu_type(MXC_CPU_MX6ULL)) {
board_id = (readl(OCOTP_GP1) != 0)?readl(OCOTP_GP1):readl(OCOTP_GP2);
- if (((board_id & ULL_ID_MASK) == VESTA_300B) || ((board_id & ULL_ID_MASK) == VESTA_300B1)) {
- setenv("board_type", "vesta-300B");
- setenv("fdt_file", "zImage-vesta-300B.dtb");
+ if (((board_id & ULL_ID_MASK) == VESTA_500) || ((board_id & ULL_ID_MASK) == VESTA_500_1)) {
+ setenv("board_type", "vesta-500");
+ setenv("fdt_file", "zImage-vesta-500.dtb");
}
else {
printf ("Board id not recognized\n");
......@@ -35,6 +35,7 @@ SRC_URI += "file://0009-Added-defconfig-for-boards-with-qspi-flash.patch"
SRC_URI += "file://0010-BugFix-Changes-board-detection-logic-for-300B-boards.patch"
SRC_URI += "file://0011-Enable_retry_Disable_bootdelay.patch"
SRC_URI += "file://0012-Fix_multiple_definition_warning.patch"
SRC_URI += "file://0013-Rename-300B-to-500.patch"
SRC_URI += "file://qspi-header"
S = "${WORKDIR}/git"
......
......@@ -2,8 +2,8 @@
#
# Start bluettooh coexistance user-space daemon. This has to occur after
# the dbus has been started, or the daemon will crash
if [[ $(for i in $(cat /proc/cmdline);do if [[ $i = "board_type="* ]]; then echo $i; fi; done | cut -d= -f2) = "vesta-300B" ]]; then
echo "Vesta-300B detected, abtfilt daemon is not needed";
if [[ $(for i in $(cat /proc/cmdline);do if [[ $i = "board_type="* ]]; then echo $i; fi; done | cut -d= -f2) = "vesta-500" ]]; then
echo "Vesta-500 detected, abtfilt daemon is not needed";
else
echo "Running abtfilt daemon"
......
......@@ -14,12 +14,12 @@ set_antenna(){
ln -s /lib/firmware/$antenna $bdwlan
}
if [[ $(for i in $(cat /proc/cmdline);do if [[ $i = "board_type="* ]]; then echo $i; fi; done | cut -d= -f2) = "vesta-300B" ]]; then
if [[ $(for i in $(cat /proc/cmdline);do if [[ $i = "board_type="* ]]; then echo $i; fi; done | cut -d= -f2) = "vesta-500" ]]; then
if [ ! -f $bdwlan ]; then
set_antenna
fi
echo "Vesta-300B: running qca9377 scripts...";
echo "Vesta-500: running qca9377 scripts...";
/etc/init.d/qca9377_setmac.sh
/etc/init.d/qca9377_hciattach.sh
else
......
......@@ -153,7 +153,7 @@ get_ull_sn_board () {
}
# Searching for a string matches with the format board_type=XXXX
if [[ "$(for i in $(cat /proc/cmdline);do if [[ $i = "board_type="* ]]; then echo $i; fi; done | cut -d= -f2)" = "vesta-300B" ]] ; then
if [[ "$(for i in $(cat /proc/cmdline);do if [[ $i = "board_type="* ]]; then echo $i; fi; done | cut -d= -f2)" = "vesta-500" ]] ; then
#imx6ull fuses
BSN_FUSE1=HW_OCOTP_GP1
USN_FUSE1=HW_OCOTP_GP2
......
......@@ -4,8 +4,8 @@ SUMMARY = "Rigado's general purpose tool"
DESCRIPTION = "A tool for the gateway which changes functionality based on how it is linked"
# The latest commit
SRCREV = "d8aea11c5d83be6c27610fda8e29e57ead898db9"
SRCBRANCH ?= "v3.0.0"
SRCREV = "746b46c73bca7ead87f5c2f8277edce681b74bec"
SRCBRANCH ?= "v2.5.1"
require recipes-core/rigtools/rigtools.inc
......@@ -11,8 +11,8 @@ SRC_URI += "file://defconfig \
file://device-tree/vesta-300-mfg.dts \
file://device-tree/vesta-400.dts \
file://device-tree/vesta-400-mfg.dts \
file://device-tree/vesta-300B.dts \
file://device-tree/vesta-300B-mfg.dts \
file://device-tree/vesta-500.dts \
file://device-tree/vesta-500-mfg.dts \
file://device-tree/vesta-64M-nor.dts \
file://device-tree/vesta-64M-nor-mfg.dts \
file://device-tree/vesta-rad-mfg.dts \
......@@ -48,8 +48,8 @@ do_configure_append() {
cp ${WORKDIR}/device-tree/vesta-300-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-400.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-400-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-300B.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-300B-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-500.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-500-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-64M-nor.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-64M-nor-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-rad-mfg.dts ${S}/arch/${ARCH}/boot/dts
......
......@@ -14,8 +14,8 @@
/ {
model = "Rigado Vesta 300B Board ";
compatible = "fsl,vesta-500", "fsl,vesta-300B", "fsl,imx6ull";
model = "Rigado Vesta 500 Board ";
compatible = "fsl,vesta-500", "fsl,imx6ull";
version = "1.0.0";
......
......@@ -14,10 +14,9 @@
/ {
model = "Rigado Vesta 300B Board ";
compatible = "fsl,vesta-500", "fsl,vesta-300B", "fsl,imx6ull";
version = "1.0.0";
model = "Rigado Vesta 500 Board ";
compatible = "fsl,vesta-500", "fsl,imx6ull";
version = "1.0.0";
chosen {
stdout-path = &uart2;
......@@ -59,7 +58,7 @@
regulator-name = "vref-3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
};
};
/* All expansion cards should be listed here, as disabled */
......@@ -466,24 +465,24 @@
};
&usdhc1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_wifi>;
no-1-8-v;
non-removable;
bus-width = <4>;
pm-ignore-notify;
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_wifi>;
no-1-8-v;
non-removable;
bus-width = <4>;
pm-ignore-notify;
status = "okay";
};
&usdhc2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
no-1-8-v;
non-removable;
bus-width = <8>;
keep-power-in-suspend;
enable-sdio-wakeup;
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
no-1-8-v;
non-removable;
bus-width = <8>;
keep-power-in-suspend;
enable-sdio-wakeup;
status = "okay";
};
/* Vesta expansion card DT overlay manager - based on beaglebone cape manager */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment