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
|
From 02714f8c47a6500209907afcc6faf8823e55c0ca Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 14 Aug 2017 18:37:05 -0600
Subject: [PATCH] arch linux arm modifications
---
configs/am335x_boneblack_defconfig | 1 -
include/configs/am335x_evm.h | 8 +++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
index 3d86c1b34e..b8a72e57df 100644
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -5,7 +5,6 @@ CONFIG_AM33XX=y
# CONFIG_SPL_NAND_SUPPORT is not set
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y
CONFIG_ARCH_MISC_INIT=y
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 0c6d2880da..9afc46411d 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -17,6 +17,7 @@
#define __CONFIG_AM335X_EVM_H
#include <configs/ti_am335x_common.h>
+#define CONFIG_ENV_IS_NOWHERE
#ifndef CONFIG_SPL_BUILD
# define CONFIG_TIMESTAMP
@@ -76,10 +77,7 @@
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
- func(LEGACY_MMC, legacy_mmc, 0) \
func(MMC, mmc, 1) \
- func(LEGACY_MMC, legacy_mmc, 1) \
- func(NAND, nand, 0) \
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
@@ -87,6 +85,10 @@
"if test ${boot_fit} -eq 1; then " \
"run update_to_fit;" \
"fi;" \
+ "gpio clear 54; " \
+ "gpio clear 55; " \
+ "gpio clear 56; " \
+ "gpio set 53; " \
"run findfdt; " \
"run init_console; " \
"run envboot; " \
@@ -104,8 +106,9 @@
DEFAULT_FIT_TI_ARGS \
"bootpart=0:2\0" \
"bootdir=/boot\0" \
- "bootfile=zImage\0" \
- "fdtfile=undefined\0" \
+ "bootfile=vmlinuz-linux-libre\0" \
+ "rdfile=initramfs-linux-libre.img\0" \
+ "fdtfile=/boot/dtbs/linux-libre\0" \
"console=ttyO0,115200n8\0" \
"partitions=" \
"uuid_disk=${uuid_gpt_disk};" \
--
2.14.1
|
