summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShohei Sakamoto <sakamotos@casio.co.jp>2017-03-28 03:52:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-28 03:52:45 +0000
commit05b94fcf880acc2bf2c914dcdc59e6ad6f50542d (patch)
tree7a671b5c8a629f546384c8971c9577feab761919
parent360490dbf9cb5a5bbc68a6497f8ec75a88503e98 (diff)
parent53c45e602ceb4c1e3bee123d0560a05f60be0d4a (diff)
downloadkoi-uboot-oreo-dr-wear.tar.gz
Changed ro.hardware value, bump version to KOI015oreo-dr-wear
am: 53c45e602c Change-Id: Ie204e6bcf1f6daebebd40968b0872124bcbb214b
-rw-r--r--board/samsung/koi/koi.c6
-rw-r--r--include/configs/koi.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/board/samsung/koi/koi.c b/board/samsung/koi/koi.c
index c41ae57bc..977d1675c 100644
--- a/board/samsung/koi/koi.c
+++ b/board/samsung/koi/koi.c
@@ -867,7 +867,11 @@ int board_late_init(void)
memset(tmp_buf,0,sizeof(tmp_buf));
sprintf(tmp_buf, " androidboot.bootreason=%s androidboot.bootloader=%s ",
reason, VERSION_BOOTLOADER);
- strcat(tmp_buf, CONFIG_BOOTARGS);
+// strcat(tmp_buf, CONFIG_BOOTARGS);//not necessary because same string is supplied by kernel dts
+ if (model)
+ strcat(tmp_buf, "androidboot.hardware=ayu");
+ else
+ strcat(tmp_buf, "androidboot.hardware=koi");
if ((ret = get_bootarg_from_info_partition(tmp_buf)) < 0) {
if (copy_info_partition() == 0) // copy from old location
diff --git a/include/configs/koi.h b/include/configs/koi.h
index 2c58a7597..1f294f812 100644
--- a/include/configs/koi.h
+++ b/include/configs/koi.h
@@ -325,7 +325,7 @@
#define CONFIG_FACTORY_RESET_COMMAND \
"ext4format mmc 0:3;ext4format mmc 0:4;reset;"
-#define CONFIG_BOOTARGS "console=ttySAC2,115200 androidboot.hardware=koi"
+/*#define CONFIG_BOOTARGS "console=ttySAC2,115200"*/
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
@@ -492,7 +492,7 @@
#define CONFIG_INTEGRATED_IMG
/* version-bootloader */
-#define VERSION_BOOTLOADER "KOI014"
+#define VERSION_BOOTLOADER "KOI015"
#define CONFIG_AUTO_FW_WRITE