From 8fa7ccbae07df78c4fa92a231ed093042567f227 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Mon, 25 Feb 2019 14:01:16 +0900 Subject: [PATCH] config: tizen_rpi: move some bootarg values to tizen_rpi header Some bootargs values can be located to tizen_rpi header. Because it's used same value in script of rpi3 and rpi3 32b. Change-Id: I73d2d473d624f2ffa37f1fe0ed959ff098bb9247 Signed-off-by: Jaehoon Chung --- board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr | 2 +- board/raspberrypi/rpi/tizen-boot-rpi3.scr | 2 +- include/samsung/tizen_rpi.h | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr b/board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr index b3e6bb0..df6e93d 100644 --- a/board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr +++ b/board/raspberrypi/rpi/tizen-boot-rpi3-32b.scr @@ -44,7 +44,7 @@ fi setenv boot_prefixes \"/\" # To use comdline for using serial console. /* Normal mode */ -setenv bootargs \"8250.nr_uarts=1 dma.dmachans=0x7f35 bcm2709.serial=0xed6687d3 bcm2709.uart_clock=48000000 smsc95xx.macaddr=${ethaddr} root=/dev/${rootdev} rw bootmode=${bootmode} bcm2709.boardrev=0xa02082 rootwait ${console} vc_mem.mem_base=0x3dc00000 vc_mem.mem_size=0x3f000000 dwc_otg.lpm_enable=0 ${opts}\" +setenv bootargs \"${tizen_bootarg} smsc95xx.macaddr=${ethaddr} root=/dev/${rootdev} rw bootmode=${bootmode} rootwait ${console} ${opts}\" # Find the ramdisk offset and block count part start $bootdev $mmcrootdev $ramdiskpart ramdisk_start diff --git a/board/raspberrypi/rpi/tizen-boot-rpi3.scr b/board/raspberrypi/rpi/tizen-boot-rpi3.scr index 12edf56..cca6f56 100644 --- a/board/raspberrypi/rpi/tizen-boot-rpi3.scr +++ b/board/raspberrypi/rpi/tizen-boot-rpi3.scr @@ -59,7 +59,7 @@ fi setenv boot_prefixes \"/\" # To use comdline for using serial console. /* Normal mode */ -setenv bootargs \"8250.nr_uarts=1 dma.dmachans=0x7f35 bcm2709.serial=0xed6687d3 bcm2709.uart_clock=48000000 smsc95xx.macaddr=${ethaddr} root=/dev/${rootdev} rw bootmode=${bootmode} bcm2709.boardrev=0xa02082 rootwait ${console} vc_mem.mem_base=0x3dc00000 vc_mem.mem_size=0x3f000000 dwc_otg.lpm_enable=0 ${opts} ${ip_opt}\" +setenv bootargs \"${tizen_bootarg} smsc95xx.macaddr=${ethaddr} root=/dev/${rootdev} rw bootmode=${bootmode} rootwait ${console} ${opts} ${ip_opt}\" # Find the ramdisk offset and block count part start $bootdev $mmcrootdev $ramdiskpart ramdisk_start diff --git a/include/samsung/tizen_rpi.h b/include/samsung/tizen_rpi.h index 00a0039..c4f048b 100644 --- a/include/samsung/tizen_rpi.h +++ b/include/samsung/tizen_rpi.h @@ -80,6 +80,10 @@ "bootmode=ramdisk\0" \ "bootdev=mmc\0" \ "tfm=setenv bootmode download; run bootcmd\0" \ + "tizen_bootarg=" \ + "8250.nr_uarts=1 dma.dmachans=0x7f35 bcm2709.serial=0xed6687d3 " \ + "bcm2709.uart_clock=48000000 vc_mem.mem_base=0x3dc00000" \ + "vc_mem.mem_size=0x3f000000 dwc_otg.lpm_enable=0\0" \ "opts=loglevel=7\0" #endif /* __CONFIG_TIZEN_RPI_H */ -- 2.7.4