rpi3: config: rename config.txt to identify 64bit

Rename config.txt to config_64bit.txt to identify 64bit.

Note: The rpm packaging should be done as config.txt because the
name is used from bootcode.bin.

Change-Id: I41ca9c90673d2ee747b326627bced12e2284f1b8
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/packaging/linux-rpi3.spec b/packaging/linux-rpi3.spec
index 0019e918bc5022f3ed65e37a42869c2899dfee13..34656656319ef7b07c45ed0203d5aa8d466353a4 100644 (file)
--- a/packaging/linux-rpi3.spec
+++ b/packaging/linux-rpi3.spec
@@ -90,7 +90,7 @@ install -m 644 arch/%{buildarch}/boot/dts/broadcom/bcm*.dtb %{buildroot}/boot/
 make INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=%{buildroot} modules_install
 
 # 2-4. Install boot binary files
-install -m 644 rpi3/boot/config.txt %{buildroot}/boot/
+install -m 644 rpi3/boot/config_64bit.txt %{buildroot}/boot/config.txt
 install -m 644 rpi3/boot/LICENCE.broadcom %{buildroot}/boot/
 install -m 644 rpi3/boot/bootcode.bin %{buildroot}/boot/
 install -m 644 rpi3/boot/start*.elf %{buildroot}/boot/

diff --git a/rpi3/boot/config.txt b/rpi3/boot/config.txt
deleted file mode 100644 (file)
index ceed842..0000000
--- a/rpi3/boot/config.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-# For more options and information see
-# http://rpf.io/configtxt
-# Some settings may impact device functionality. See link above for details
-
-# uncomment if you get no picture on HDMI for a default "safe" mode
-#hdmi_safe=1
-
-# uncomment this if your display has a black border of unused pixels visible
-# and your display can output without overscan
-#disable_overscan=1
-
-# uncomment the following to adjust overscan. Use positive numbers if console
-# goes off screen, and negative if there is too much border
-#overscan_left=16
-#overscan_right=16
-#overscan_top=16
-#overscan_bottom=16
-
-# uncomment to force a console size. By default it will be display's size minus
-# overscan.
-#framebuffer_width=1280
-#framebuffer_height=720
-
-# uncomment if hdmi display is not detected and composite is being output
-#hdmi_force_hotplug=1
-
-# uncomment to force a specific HDMI mode (this will force VGA)
-#hdmi_group=1
-#hdmi_mode=1
-
-# uncomment to force a HDMI mode rather than DVI. This can make audio work in
-# DMT (computer monitor) modes
-#hdmi_drive=2
-
-# uncomment to increase signal to HDMI, if you have interference, blanking, or
-# no display
-#config_hdmi_boost=4
-
-# uncomment for composite PAL
-#sdtv_mode=2
-
-#uncomment to overclock the arm. 700 MHz is the default.
-#arm_freq=800
-
-# Uncomment some or all of these to enable the optional hardware interfaces
-#dtparam=i2c_arm=on
-#dtparam=i2s=on
-dtparam=spi=on
-
-# Uncomment this to enable the lirc-rpi module
-#dtoverlay=lirc-rpi
-
-# Additional overlays and parameters are documented /boot/overlays/README
-
-# Enable audio (loads snd_bcm2835)
-dtparam=audio=on
-
-# Enable serial
-enable_uart=1
-uart_2ndstage=1
-
-# Bit 9 of arm_control determines if arm is booted in 32-bit mode or 64-bit mode
-#arm_control=0x0       # for 32-bit
-arm_control=0x200      # for 64-bit
-
-# Kernel binary
-kernel=u-boot-spl.bin
-
-# Device tree binary
-device_tree=bcm2710-rpi-3-b.dtb
-
-# Kernel Address 0x0
-kernel_old=1
-
-# Skip filling ATAGS
-disable_commandline_tags=1
-
-# enable JTAG flag
-enable_jtag_gpio=1
-
-# Enable the camera module
-start_x=1
-
-# Turn off the red camera LED when recording video or taking a still picture
-disable_camera_led=1
-
-# Minimum GPU memory for camera use
-gpu_mem=128

diff --git a/rpi3/boot/config_64bit.txt b/rpi3/boot/config_64bit.txt
new file mode 100644 (file)
index 0000000..ceed842
--- /dev/null
+++ b/rpi3/boot/config_64bit.txt
@@ -0,0 +1,88 @@
+# For more options and information see
+# http://rpf.io/configtxt
+# Some settings may impact device functionality. See link above for details
+
+# uncomment if you get no picture on HDMI for a default "safe" mode
+#hdmi_safe=1
+
+# uncomment this if your display has a black border of unused pixels visible
+# and your display can output without overscan
+#disable_overscan=1
+
+# uncomment the following to adjust overscan. Use positive numbers if console
+# goes off screen, and negative if there is too much border
+#overscan_left=16
+#overscan_right=16
+#overscan_top=16
+#overscan_bottom=16
+
+# uncomment to force a console size. By default it will be display's size minus
+# overscan.
+#framebuffer_width=1280
+#framebuffer_height=720
+
+# uncomment if hdmi display is not detected and composite is being output
+#hdmi_force_hotplug=1
+
+# uncomment to force a specific HDMI mode (this will force VGA)
+#hdmi_group=1
+#hdmi_mode=1
+
+# uncomment to force a HDMI mode rather than DVI. This can make audio work in
+# DMT (computer monitor) modes
+#hdmi_drive=2
+
+# uncomment to increase signal to HDMI, if you have interference, blanking, or
+# no display
+#config_hdmi_boost=4
+
+# uncomment for composite PAL
+#sdtv_mode=2
+
+#uncomment to overclock the arm. 700 MHz is the default.
+#arm_freq=800
+
+# Uncomment some or all of these to enable the optional hardware interfaces
+#dtparam=i2c_arm=on
+#dtparam=i2s=on
+dtparam=spi=on
+
+# Uncomment this to enable the lirc-rpi module
+#dtoverlay=lirc-rpi
+
+# Additional overlays and parameters are documented /boot/overlays/README
+
+# Enable audio (loads snd_bcm2835)
+dtparam=audio=on
+
+# Enable serial
+enable_uart=1
+uart_2ndstage=1
+
+# Bit 9 of arm_control determines if arm is booted in 32-bit mode or 64-bit mode
+#arm_control=0x0       # for 32-bit
+arm_control=0x200      # for 64-bit
+
+# Kernel binary
+kernel=u-boot-spl.bin
+
+# Device tree binary
+device_tree=bcm2710-rpi-3-b.dtb
+
+# Kernel Address 0x0
+kernel_old=1
+
+# Skip filling ATAGS
+disable_commandline_tags=1
+
+# enable JTAG flag
+enable_jtag_gpio=1
+
+# Enable the camera module
+start_x=1
+
+# Turn off the red camera LED when recording video or taking a still picture
+disable_camera_led=1
+
+# Minimum GPU memory for camera use
+gpu_mem=128