Marek Szyprowski [Tue, 1 Dec 2020 17:38:51 +0000 (18:38 +0100)]
configs: Enable options for splash image in odroid-{c4,n2}_defconfig
These options are needed for the splash image loading.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I892b493a1f1d2509649a8cca59d25c62b3613332
Sylwester Nawrocki [Wed, 2 Dec 2020 15:32:54 +0000 (16:32 +0100)]
tizen: amlogic: Add hdmimode env variable
The hdmimode variable set to "1080p60hz" value allows the HDMI driver
to switch to default full HD timings for QHD/UHD monitors and such
monitors can still be used in lower resolution mode.
This a workaround until proper support for QHD/UHD is implemented
in the VPU driver.
The new variable is also used in kernel bootargs.
Change-Id: Ib1b58ee9173fa380c1c79bf819b0ffaca1a6aab9
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Sylwester Nawrocki [Wed, 25 Nov 2020 19:13:55 +0000 (20:13 +0100)]
video: meson: Add fallback to default timings for QHD/UHD monitors
The HDMI driver currently supports only up to 1920x1200 resolutions
and QHD/UHD monitors might not specify detailed timings in EDID other
than those for their maximum resolution, even though they work with
lower resolutions like full HD. In such cases display_read_timings()
will fail breaking the video output driver initialization.
As a workaround fallback to full HD timings is added for QHD or UHD
monitors. The default timing will only be used when "hdmimode"
environment variable is set to "1080p60hz", otherwise the driver
switches to CVBS mode as before, when display timings are
unsupported/could not be read.
The proper solution would be to implement support for 2K/4K HDMI
modes, which are also not supported yet by driver in the kernel.
Change-Id: I407228392a6b1b6e8b0c55a6962235111df0c69c
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Sylwester Nawrocki [Wed, 2 Dec 2020 09:37:27 +0000 (10:37 +0100)]
tizen: Add splash image file to the bootloader tar image
Change-Id: Ie3e1f76a663eddb65887ec42c651dedbd6b07f81
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Sylwester Nawrocki [Tue, 1 Dec 2020 17:38:51 +0000 (18:38 +0100)]
configs: Enable options for splash image in khadas-vim3(l)_defconfig
These options are needed for the splash image loading.
Change-Id: Ieeddd2e2d9ff6872297b9eb3f3d899702ee717a7
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Sylwester Nawrocki [Thu, 26 Nov 2020 16:42:18 +0000 (17:42 +0100)]
tizen: amlogic: add CONFIG entries for splash image loading
These options are needed for decompressing the logo image file
(gzipped BMP).
Change-Id: Ieb3c35adf5007e2f795f2cecc3cf365e7a40b629
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Sylwester Nawrocki [Thu, 26 Nov 2020 18:45:01 +0000 (19:45 +0100)]
configs: tizen_amlogic: Add environment variables for splash image
Set the splash file location, bmp image load address and logo position
on the display.
The compressed bitmap file should be installed on first mmc partition.
Change-Id: Ic1ce517460beaf318821f53ed3adbe6c41e091e8
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Sylwester Nawrocki [Tue, 1 Dec 2020 17:37:40 +0000 (18:37 +0100)]
packaging: u-boot-vim3(l): Add tizen logo bitmap file
This image will be used as u-boot splash image.
Change-Id: I262cc2219435afc7c8f208ff39b2bf7cce6a636c
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Sylwester Nawrocki [Wed, 2 Dec 2020 08:36:29 +0000 (09:36 +0100)]
gitattributes: Set binary attribute for *.gz and *.png files
After commit ("1f35137 Add .gitattributes for line endings") all files
have text attribute set and we need such change to ensure content of
the *.gz and *.png files remains unmodified.
$ git check-attr -a -- *.gz *.png
*.gz: binary: set
*.gz: diff: unset
*.gz: merge: unset
*.gz: text: unset
*.gz: eol: lf
*.png: binary: set
*.png: diff: unset
*.png: merge: unset
*.png: text: unset
*.png: eol: lf
Change-Id: Ie7b1d48761c01c045bdcdae3b0ac66e64af79326
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Marek Szyprowski [Thu, 26 Nov 2020 14:32:03 +0000 (15:32 +0100)]
tizen: enable support for formatting MBR partition layout during flashing
This is ensured by the following steps:
1. enable 'mbr' command and provide default partiton layout,
2. add support for formating block device from THOR downloaded script,
3. check MBR partition layout on boot and enter THOR mode if invalid
4. provide a script for formating MBR for THOR download
MBR partition layout is checked on boot if it mathes the one defined
during u-boot compilation. If not, set dfu_alt_info to the minimal safe
list and enter THOR download mode to flash the new, proper partition
layout and the complete Tizen image.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I490e5b3314513012259f3981feae047f95649c3b
Marek Szyprowski [Fri, 27 Nov 2020 15:10:34 +0000 (16:10 +0100)]
thor: add support for dfu_alt_info reintialization from the downloaded script
Reinitialize dfu_env_entities after flashing the 'SCRIPT' entity to
ensure that the potential changes to the 'dfu_alt_info' environment
variable are applied.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Iad98f348d25ee37fbb7493d4e567d1a4de55dc2c
Marek Szyprowski [Wed, 2 Dec 2020 12:56:19 +0000 (13:56 +0100)]
dfu: add support for dfu_alt_info reintialization from the flashed script
Reinitialize DFU USB gadget after flashing the 'SCRIPT' entity to ensure
that the potential changes to the 'dfu_alt_info' environment variable are
applied.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Ia5025c765c83defc96da17b8c059dff833ec257b
Marek Szyprowski [Fri, 27 Nov 2020 15:08:28 +0000 (16:08 +0100)]
dfu: add 'SCRIPT' entity support
Define a new 'SCRIPT' type for DFU entities. The downloaded data are
treated as simple u-boot's scripts and executed with run_command_list()
function.
Flashing the 'SCRIPT' entity might result in changing the 'dfu_alt_info'
from that script. Add a global variable for tracking the potential need
to reinitialize the dfu_alt_info structures.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I8b43528ba82c4aecf5e84bbcb6ce1ca7b7621075
Marek Szyprowski [Thu, 26 Nov 2020 14:27:00 +0000 (15:27 +0100)]
cmd: Add MBR partition layout control utility
Add a 'mbr' command to let user create or verify MBR partition layout
based on the provided text description. The partition layout is
altearnatively read from 'mbr_parts' environment variable. This can be
used in scripts to help system image flashing tools to ensure proper
partition layout.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I8fd4d79a630296d41567e6288b6b4e4d083f7648
Marek Szyprowski [Thu, 26 Nov 2020 14:25:01 +0000 (15:25 +0100)]
part: dos: add code for creating MBR partition layout
Add code for creating and writing MBR partition layout. The code generates
similar layout of EBRs (Exteneded Block Records) and logical volumes as
Linux's fdisk utility.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I52724de45f32cdde43d900e586d30831906f9280
Marek Szyprowski [Thu, 26 Nov 2020 14:23:41 +0000 (15:23 +0100)]
disk: dos: make some functions static
Make function not used outside this file static.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I37039841c3a1530d5a81e5917f2f497b3bedcbbc
Marek Szyprowski [Thu, 26 Nov 2020 14:22:32 +0000 (15:22 +0100)]
disk: dos: use generic macro for unaligned le32 access
Use a generic helper for reading LE32 integers.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Iafa317eec51629733b1fac645b96a749845edd08
Marek Szyprowski [Thu, 26 Nov 2020 14:19:54 +0000 (15:19 +0100)]
disk: dos: add some defines for the hardcoded numbers
Add handy defines for some hardcoded magic numbers related to extended
partition handling.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Ibcd229cc2782d2ca37601ca035afc467c589850e
Marek Szyprowski [Thu, 26 Nov 2020 06:08:02 +0000 (07:08 +0100)]
disk: dos: rename write_mbr_partition to write_mbr_sector
write_mbr_partition() function name is a bit misleading, so rename it to
write_mbr_sector(). This is a preparation for adding code for writing a
complete MBR partition layout.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Ifd90eb8c2584f7474b9a19e917eac24ad1b03013
Marek Szyprowski [Thu, 3 Dec 2020 16:49:23 +0000 (17:49 +0100)]
tizen: build-amlogic: add support for building images for all boards
Add 'all' target for build-amlogic.sh to build images for all supported
boards and pack them to the common amlogic_bootloader.tar.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I691672d454850e50e04c64a20c2f960ca83c709e
Marek Szyprowski [Thu, 3 Dec 2020 16:24:30 +0000 (17:24 +0100)]
tizen: bootscript: amlogic: use proper string comparison operator
The proper string comparison operator for u-boot's test is '='.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Ic7a3f5f6b456631473df94e311694774651c4144
Marek Szyprowski [Thu, 3 Dec 2020 10:57:48 +0000 (11:57 +0100)]
tizen: limit boot to MMC0 and MMC1 devices
Other types of boot are not supported on Tizen, so disable generating
scripts and envs for them.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Ibe41e9ff8e60aa6949f4a082276083adde33e187
Marek Szyprowski [Thu, 3 Dec 2020 10:55:29 +0000 (11:55 +0100)]
tizen: avoid doubled entries in params.bin
Disable generating entries (re)defined in tizen_amlogic.h to avoid
confusing user, which one is valid.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I123c58b8fb71320e20815bbb0eebb3cb3b5c5a9e
Heinrich Schuchardt [Thu, 8 Oct 2020 18:51:24 +0000 (20:51 +0200)]
tools: image-host.c: use correct output format
When building on a 32bit host the following warning occurs:
tools/image-host.c: In function ‘fit_image_read_data’:
tools/image-host.c:296:56: warning: format ‘%ld’ expects argument of
type ‘long int’, but argument 3 has type ‘__off64_t’
{aka ‘long long int’} [-Wformat=]
printf("File %s don't have the expected size (size=%ld, expected=%d)\n",
~~^
%lld
filename, sbuf.st_size, expected_size);
~~~~~~~~~~~~
tools/image-host.c:311:62: warning: format ‘%ld’ expects argument of
type ‘long int’, but argument 4 has type ‘__off64_t’
{aka ‘long long int’} [-Wformat=]
printf("Can't read all file %s (read %zd bytes, expexted %ld)\n",
~~^
%lld
filename, n, sbuf.st_size);
~~~~~~~~~~~~
Fix the format strings.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
[jh80.chung: cherry picked from mainline commit
3311eda658e0]
Change-Id: I5ed82a5c3d876a56d6b9ac75598eeed2d2b85d2a
Marek Szyprowski [Tue, 1 Dec 2020 09:36:03 +0000 (10:36 +0100)]
tizen: remove generic params.bin and u-boot.bin
The generic entity params.bin is no longer functional, so remove it. Also
remove generic entity for the u-boot.bin to force user to use proper
board specific image.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I6820c9b7fad7259525ae5ec59cae667e0482d680
Marek Szyprowski [Mon, 30 Nov 2020 14:13:51 +0000 (15:13 +0100)]
tizen: sanitize file names for VIM3(l) boards
Use only the board name (vim3/vim3l) in file names (i.e. u-boot-vim3.bin)
like it is done for odroid boards (i.e. u-boot-c4.bin).
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Ia8e4cca3bc96cd1408b75c2bae4d2a29ccd41160
Sylwester Nawrocki [Wed, 25 Nov 2020 11:13:12 +0000 (12:13 +0100)]
video: Fix line padding calculation for 16 and 24 bpp bitmaps
The line size in the bitmap file is multiple of 4 bytes. In current code
the complement of row size to a multiple of 4 bytes is further unnecessarily
multiplied by the pixel size. This result in incorrect displaying of bitmaps
with image width which is not multiple of 4 pixels. Fix this by removing
the unnecessary multiplication.
Tested with 24BPP bitmap and XRGB32 display.
Change-Id: I9bd307780e388a70f47823444fe3ecdf910d08fb
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Marek Szyprowski [Mon, 30 Nov 2020 13:14:04 +0000 (14:14 +0100)]
tizen: unify build script for all boards
Use the same build script for all Amlogic boards.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I69565c89e3960bbe353545df217f5e81d00465a4
Jaehoon Chung [Mon, 30 Nov 2020 03:33:22 +0000 (12:33 +0900)]
tizen: amlogic: change a params name to postfix of each board's name
Chagne a params.bin name to postfix of each board's name and location
to root directory.
Also changed the kernel directory from each boardname to kvim/odroid.
Change-Id: I0468f0894d7220cc55b64885c8c411f2c5340606
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Fri, 27 Nov 2020 08:24:22 +0000 (17:24 +0900)]
packaging: amlogic: use one boot.scr.uimg script
Use one boot.scr.uimg instead of each scsripts.
To prevent conflict, move to boot.scr.uimg after installed each script.
Also change the place of boot.scr.uimg in build script.
Change-Id: Ia7d0746062f6d548ae1fb36a7111d55d353a1545
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Fri, 27 Nov 2020 02:11:09 +0000 (11:11 +0900)]
tizen: bootscript: amlogic: calculate tizen_kernel_add_r with ramdisk's size
Calculate tizen_kernel_addr_r with ramdisk's size.
It cat be prevented to overwrite the images.
Change-Id: If766b514e40865c3a531c3ebbe75f6b7a6898b2a
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Fri, 27 Nov 2020 02:11:03 +0000 (11:11 +0900)]
configs: enable CONFIG_SETEXPR config
Eanble CONFIG_SETEXPR configuration.
Change-Id: If1255fabae584b17e176fb7d8cbc0324ac2b3902
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Thu, 26 Nov 2020 01:06:11 +0000 (10:06 +0900)]
packaging: u-boot-kvim3l: add kvim3l spec file
Add kvim3l spec file for khadas-vim3l.
Change-Id: Ie7ddaaab70a3218a81927ccef9953bdb41e4eb52
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Wed, 25 Nov 2020 23:12:45 +0000 (08:12 +0900)]
tizen: bootscript: create one bootscript for amlogic boards
Create one bootscript for amlogic boards.
There is a common variable to use about each boards. So it can be
reused.
Remove each bootscript files. Instead, use one script file with
board_name.
Change-Id: If50529fc1f34f3ac274ce8a0955499f3e3e12d22
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Wed, 25 Nov 2020 10:30:44 +0000 (19:30 +0900)]
tizen: bootscript: remove vim3l boot script
Remove vim3l boot sript.
Instead, use tizen-boot-khadas-vim3-64b.scr.
In future, it can be used one image after combined other amlogic script.
Change-Id: Ifa16622ca0507db6b61720d7cddd3bd66bfbb07f
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Wed, 25 Nov 2020 10:19:55 +0000 (19:19 +0900)]
tizen: bootscript: remove fdtfile in boot script
Remove fdtfile in boot script file.
Move fdtfile variable from bootscript to tizen_amlogic header.
Change-Id: I7c87253eab09332e6ab73e5174bf93a95fde60f7
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Wed, 25 Nov 2020 09:31:13 +0000 (18:31 +0900)]
tizen: bootscript: move boot scripts under bootscript directory
Move each bootscript files to tizen/bootscript directory.
It's more easier to maintain which boot script is used for tizen than now
Change-Id: I435fdf8352195091763226fdbb05b844219f5842
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Wed, 25 Nov 2020 09:20:58 +0000 (18:20 +0900)]
build: kvim3: add vim3l in build-kvim3 script
There is no reason not to reuse build-kvim3 script.
If one wants to build vim3 or vim3l, pass the argument as target name.
- ./build-kvim3.sh vim3 or vim3l
Change-Id: I645e52f8dc97269e2048c0a2357755029dcfe7d9
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Wed, 25 Nov 2020 09:08:51 +0000 (18:08 +0900)]
amlogic: w400: add tizen boot script for vim3l
Add tizen boot script for vim3l.
Change-Id: I77503992af9bc3955ddd4fefd71ded12351f20d6
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Wed, 25 Nov 2020 03:01:20 +0000 (12:01 +0900)]
samsung: tizen_amlogic: add khadas vim3l environment value
Add khadas vim3l environment value to use thor download.
Change-Id: Ie97abfee1c48ad43c29c7539a1835593e24ecc5b
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Wed, 25 Nov 2020 02:54:23 +0000 (11:54 +0900)]
ARM: meson: Add TIZEN_KHADAS_VIM3L config
Add TIZEN_KHADAS_VIM3L config and enable it.
Change-Id: I20c431b4cc5f54f1ea8f24dbc8e94290e6047f96
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Wed, 25 Nov 2020 02:32:58 +0000 (11:32 +0900)]
configs: khadas: enable configurations relevant to Tizen
Enable configurations relevant to Tizen.
Change-Id: I66dc227aa94ec7626558df611790a829b4bef165
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Tue, 24 Nov 2020 04:44:07 +0000 (13:44 +0900)]
fip: kvim3l: add the prebuilt images to make u-boot image
Add the prebuilt images to make u-boot image.
It's from khadas opensource github.
https://github.com/khadas/u-boot.gi -b khadas-vims-v2015.01
Refer to doc/board/amlogic/khadas-vim3l.rst
Change-Id: I579d9375a682c5e737080950ae25009032c7584e
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Seung-Woo Kim [Wed, 25 Nov 2020 02:49:27 +0000 (11:49 +0900)]
tizen: sd_fusing_amlogic: sync with recent script for old tools
The script was not fully sync with recent sd_fusing script change
and it cayses old sfdisk size issue because not enough EXTEND_SZ
to align block offset in extended partition. Update the parts with
recent rpi fusing script and also remove duplicated data size
variable.
Change-Id: I5bd939f9a29093d9acaf76e2b4cae7b1c8ae2de0
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Marek Szyprowski [Fri, 20 Nov 2020 12:17:46 +0000 (13:17 +0100)]
ARM: meson: Temporary fix for OdroidC4 SD card reboot issue
For the proper reboot OdroidC4 requires to switch TFLASH_VDD_EN pin to
the input (high impedance?) mode. This should be handled by the proper
reset driver, but until then implement this logic in the common code.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I7333cc5b28817823fbc05a39162eb9e06b034a6f
Jaehoon Chung [Thu, 19 Nov 2020 03:28:29 +0000 (12:28 +0900)]
tizen: amlogic: remove unused environment values
Remove unused environment values.
It doesn't need to enter the flash mode with inform file.
If it needs to consider the flash mode, then we can use Amlogic's
scheme with secure monitor command.
Change-Id: Ia5374f7b2f411c3a48c0d469c837541875f0f84a
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Thu, 19 Nov 2020 04:28:48 +0000 (13:28 +0900)]
samsung: tizen_amlogic: fix wrong defined name
Fix wrong defined name from KVIM3 to VIM3.
It's occurred a build error on gbs system.
Change-Id: Icff90e97d3e5b3c655ac0685780281b9ad414859
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Tue, 17 Nov 2020 11:35:14 +0000 (20:35 +0900)]
samsung: tizen_amlogic: increase u-boot size for raw write
Increase u-boot size from 0x850 to 0x1000.
- From 1M to 2M.
If u-boot image is over 1064K (0x850), then it will be broken.
Change-Id: I95b8a0b074d5c4b2877b98c2e5cd4057941fda64
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Marek Szyprowski [Tue, 17 Nov 2020 10:16:28 +0000 (11:16 +0100)]
tizen: amlogic: make 'dfu_alt_info' static
The data layout on the storage device is the same for both eMMC and SD
card, so after switching to the default boot MMC device, the 'dfu_alt_info'
string is static, fully known during the compile time. Use this simple
approach, which is a bit more error proof for future changes. It also
obsoletes the custom code added to Amlogic boards.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I37fc03fe245bfdf5229922ecfd5f0d00ef00b6e6
Marek Szyprowski [Tue, 17 Nov 2020 10:06:45 +0000 (11:06 +0100)]
tizen: amlogic: move trailing '\0' to the common place
To make the env setup a bit more error proof, move the required trailing
'\0' character for the 'boot_prefixes' entry to the common place.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I535afa0a870b07a9d8637add8cccb8d55bcca5a0
Marek Szyprowski [Tue, 17 Nov 2020 10:09:00 +0000 (11:09 +0100)]
tizen: amlogic: fix separators in env entries setup
The proper separator for environment entries is '\0' not '\n'.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I409ee8d10ffbfd7f235cbf9ced5547b2d8dd7a06
Marek Szyprowski [Tue, 17 Nov 2020 09:59:13 +0000 (10:59 +0100)]
tizen: amlogic: automatically set "dfu_device" env
Automatically set "dfu_device" to the current boot MMC device number. This
allows to call dfu/thor/ums commands without any parameters for the default
storage device.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I4378161c3ebf5377d50e1e28dd57d3d1511f3648
Marek Szyprowski [Tue, 17 Nov 2020 09:45:46 +0000 (10:45 +0100)]
dfu: mmc: use the default MMC device if entity specifies it as -1
Use the default MMC device set in the command line if entity specifies it
as -1. This allows to use the same dfu_alt_info string for different MMC
devices (like embedded eMMC and external SD card if data layout is the
same).
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: If076f723f60ab30f7f82c7cc9cffb484a854e29b
Marek Szyprowski [Tue, 17 Nov 2020 09:56:34 +0000 (10:56 +0100)]
cmd: ums: add getting the default parameters from env
Add reading command parameters from the environment. The same environment
variables are used as for the "dfu" and "thor" commands. This allows to
specify USB controller ("dfu_usb_con"), device interface ("dfu_interface")
and device number ("dfu_device"). Such change allows to call "ums" without
any parameters for the default storage device.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: If725408159937dc50cb375d5c80455dac5cf9b37
Marek Szyprowski [Tue, 17 Nov 2020 09:51:20 +0000 (10:51 +0100)]
cmd: ums: show device interface name in the information string
Add interface name (i.e. 'mmc') in the information string to ease user
checking which device is exported via USB Mass Storage protocol.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Ib51188a53fe5e666ceadb9ac5ce19542dc326343
Marek Szyprowski [Tue, 17 Nov 2020 09:49:20 +0000 (10:49 +0100)]
cmd: dfu: fix using the default parameters from envirnoment
This fixes commit
3768df292a8 ("samsung: misc_init_r: insert call to
platform_setup()") after rebase, because due to other changes, that code
was never reached.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I69b70f61ca5d544744a440bd1d355ebb5072d597
Marek Szyprowski [Fri, 13 Nov 2020 10:17:44 +0000 (11:17 +0100)]
tizen: sd_fusing_amlogic: wait a bit before creating filesystems
With Ubuntu 18.04 and slow SD card I've observed that partition scan
takes too much time, so the calls to create filesystems on the created
partitions fail. Partition rescan is done asynchronously so there is no
easy way to check it. Force a 2 seconds delay before creating filesystems
to avoid this issue.
This fixes the following issue:
--->8---
The partition table has been altered.
Calling ioctl() to re-read partition table.
Syncing disks.
mkfs.fat 4.1 (2017-01-24)
mkfs.fat: warning - lowercase labels might not work properly with DOS or Windows
mkfs.vfat: unable to open /dev/sdb1: No such file or directory
mkfs.ext4: Device size reported to be zero. Invalid partition specified, or
partition table wasn't reread after running fdisk, due to
a modified partition being busy and in use. You may need to reboot
to re-read your partition table.
mkfs.ext4: Device size reported to be zero. Invalid partition specified, or
partition table wasn't reread after running fdisk, due to
a modified partition being busy and in use. You may need to reboot
to re-read your partition table.
mkfs.ext4: Device size reported to be zero. Invalid partition specified, or
partition table wasn't reread after running fdisk, due to
a modified partition being busy and in use. You may need to reboot
to re-read your partition table.
mkfs.ext4: Device size reported to be zero. Invalid partition specified, or
partition table wasn't reread after running fdisk, due to
a modified partition being busy and in use. You may need to reboot
to re-read your partition table.
mkfs.ext4: Device size reported to be zero. Invalid partition specified, or
partition table wasn't reread after running fdisk, due to
a modified partition being busy and in use. You may need to reboot
to re-read your partition table.
mkfs.ext4: Device size reported to be zero. Invalid partition specified, or
partition table wasn't reread after running fdisk, due to
a modified partition being busy and in use. You may need to reboot
to re-read your partition table.
mkfs.ext4: Device size reported to be zero. Invalid partition specified, or
partition table wasn't reread after running fdisk, due to
a modified partition being busy and in use. You may need to reboot
to re-read your partition table.
mkfs.ext4: Device size reported to be zero. Invalid partition specified, or
partition table wasn't reread after running fdisk, due to
a modified partition being busy and in use. You may need to reboot
to re-read your partition table.
End /dev/sdb format
--->8---
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I9bcfa9724ae64bff0725000600c579fa9bc33932
Marek Szyprowski [Thu, 12 Nov 2020 14:17:53 +0000 (15:17 +0100)]
tizen: build scripts: use cross compiler from env if provided
If user set CROSS_COMPILE env in his shell, use it instead of the
hard-coded path ("/usr/bin/aarch64-linux-gnu-") from the scripts.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Ibd005fd32349c7af091ff0c60def8ba63e4d2fc0
Marek Szyprowski [Thu, 12 Nov 2020 14:14:52 +0000 (15:14 +0100)]
tizen: use compressed kernel image
To speed-up kernel load and reduce total image size, use compressed kernel
image.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I9f30a4677851053082abb1aa32d93a789666170c
Marek Szyprowski [Thu, 12 Nov 2020 11:49:53 +0000 (12:49 +0100)]
board: amlogic: add proper boot device detection for params.bin load
Detect eMMC/SD card boot and report proper MMC device to the environment
loading code. This requires to use an empty device part in
CONFIG_ENV_FAT_DEVICE_AND_PART to let the code update the device to the
value returned by mmc_get_env_dev() function.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I4ff26f3be631a018a3707b58b6ffaf15fd717001
Jaehoon Chung [Thu, 12 Nov 2020 01:07:31 +0000 (10:07 +0900)]
board: amlogic: remove prefixes in boot scripts
Remove prefixes in boot scripts. Instead, use boot_prefixes about each
boards.
Add a debug message for checking a directory.
If there is no kernel image under odroid-c4 directory, then it will
search for kernel image under /.
Change-Id: I4ca259c31bf8b8a360d9095d5039adcdf77d5590
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Wed, 11 Nov 2020 02:01:29 +0000 (11:01 +0900)]
samsung: tizen_amlogic: fix directory path about thor fail
Fix directory path about thor fail.
When flash to directory, it didn't match "/" with filename.
Change-Id: I5cc65c1b8aa5741dfab5b532c070d82146444f68
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Wed, 11 Nov 2020 00:53:59 +0000 (09:53 +0900)]
script: tizen: add amlogic fusning script
Add amlogic fusning script.
- VIM3, VIM3L, Odroid-N2, Odroid-C4
Change-Id: I0331840839de5f8bbbea5c4bfd188089d8f9c853
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Wed, 11 Nov 2020 00:33:03 +0000 (09:33 +0900)]
samsung: tizen_amlogic: add ramdisk-recovery in dfu_alt_system
Add ramdisk-recovery image in dfu_alt_system.
Tizen is supporting ramdisk-recovery.
Change-Id: I68eb9205d9c5d2f6980d781c16b8415eb38d9a4e
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Wed, 11 Nov 2020 00:25:48 +0000 (09:25 +0900)]
board: amlogic: remove DFU_ALT_BOOT_SD about alt_boot
It doesn't need to set to DFU_ALT_BOOT_SD.
It's only using raw write on Amlogic board. Not need to consider what
device is selected.
Change-Id: Ie444ded409f16e60e8622611bf2135b034940ecd
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Tue, 10 Nov 2020 08:02:55 +0000 (17:02 +0900)]
mmc: meson_gx_mmc: enable DDR_52MHz mode
Enable DDR_52MHz mode.
Change-Id: I6bdebff8069f901fe7fc7fdd551d02e0ba89c60e
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Tue, 10 Nov 2020 07:44:53 +0000 (16:44 +0900)]
mmc: meson_gx_mmc: control ddr_mode bit
EMMC_CFG register has a cfg_ddr bit(BIT[2]).
It needs to set when mmc is running to ddr mode.
Otherwise, its bit should be cleared.
CFG_DDR[2] - 1: DDR mode, 0: SDR mode
Change-Id: I5b1ddc6492e9c0d90e974fa31b13eacdee6e38e3
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Tue, 10 Nov 2020 07:07:20 +0000 (16:07 +0900)]
tizen: add build script about amlogic board
It's complicated to build amlogic boards.
It will be helpful to provide the build script about each boards.
Change-Id: Iaa17e3a728ba323e2de81f6deaf1b3bf92b91ae5
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Mon, 9 Nov 2020 07:48:24 +0000 (16:48 +0900)]
board: amlogic: add odroid-c4 boot script for tizen
Add boot script for tizen.
Change-Id: If5c3992d710c0edda4a6641edfa07671bcc5f3a7
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Mon, 9 Nov 2020 07:09:23 +0000 (16:09 +0900)]
packaging: u-boot-c4: Add u-boot-c4 spec file
Add u-boot-c4 spec file.
Change-Id: I7452d64821cad3ff32c87233fe7c08b825988641
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Mon, 9 Nov 2020 06:34:21 +0000 (15:34 +0900)]
samsung: tizen_amlogic: remove CONFIG_SYS_PROMPT in header file
Remove CONFIG_SYS_PROMPT in tizen_amlogic header file.
Instead, it's enabled in each defconfigs with correct board name.
Change-Id: I8d47240e2af97bb2833f4af8720d019588a72e22
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Mon, 9 Nov 2020 06:16:25 +0000 (15:16 +0900)]
samsung: tizen_amlogic: add alt_system info for odroid-c4
Add alt_system information for Odroid-C4.
- Kernel will be located to /odroid-c4/ directory.
Change-Id: I4b337349e465bdd3df5864bb724f78903d4ee46c
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Mon, 9 Nov 2020 04:53:52 +0000 (13:53 +0900)]
configs: odroid-c4: fix ENV_SIZE and other configs
Fix ENV_SIZE and other configs.
- Change from 0x2000 to 0x4000
- SYS_MMC_ENV_DEV/PART set to 1.
- Enable CONFIG_TIZEN_ODROID_C4
- SYS_PROMPT is "Odroid C4>"
Change-Id: I888b3b531152663566a646f024c408c66f8d7bf3
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Mon, 9 Nov 2020 04:37:31 +0000 (13:37 +0900)]
configs: odroid-c4: support THOR protocol on Odroid-C4
Support THOR protocol on Odroid-C4.
Change-Id: I3e1b20139e9064dcdfd4b87af89f7ce520b0cbc2
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Mon, 9 Nov 2020 04:36:17 +0000 (13:36 +0900)]
board: odroid-n2: set an alt_boot information for odroid-c4
Set an alt_boot information for odroid-c4.
Change-Id: I4add745c1f37f31105241773361cd7dc08aed08f
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Mon, 9 Nov 2020 04:34:59 +0000 (13:34 +0900)]
samsung: tizen_amlogic: add dfu_alt_boot for Odroid-C4
Add dfu_alt_boot for Odroid-C4.
Bootloader name should be u-boot-c4.bin.
Change-Id: Iea4be8183124213333722733cbc65166fdb87f5f
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Mon, 9 Nov 2020 04:19:02 +0000 (13:19 +0900)]
ARM: meson: Add TIZEN_ODROID_C4 config
Add TIZEN_ODROID_C4 configuration.
It's to disinguish with other amlogic boards.
Change-Id: I41eebb30a22538f53d25bf34646b796d3d608d99
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Mon, 9 Nov 2020 03:04:14 +0000 (12:04 +0900)]
mmc: meson_gx_mmc: change a clock phase to stable value
Core clock phase value is changed from 180' to 270'.
It's more stable than before.
- Odroidn-N2/C4 : Working fine
- VIM3 : Working fine
Before this patch, Odroid-C4 doesn't work fine with 52MHz.
Change-Id: Ica3b034a9c229b76e23cd3a5cb90fbf1f1350f34
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Fri, 6 Nov 2020 00:12:46 +0000 (09:12 +0900)]
fip: add the prebuilt image to use odroid-c4
Add the prebuilt image to use odroid-c4.
These files are taken from hardkernel github and built in local.
- https://github.com/hardkernel/u-boot.git -b odroidg12-v2015.01
Refer to doc/board/amlogic/odroid-c4.rst
Change-Id: If030fccddd2fcc96c051b363695ad825cca1d25b
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Fri, 6 Nov 2020 04:08:33 +0000 (13:08 +0900)]
configs: enable CONFIG_SET_DFU_ALT_INFO in defconfig
Enable CONFIG_SET_DFU_ALT_INFO in defconfig instead of header file.
Change-Id: I5825eb9a0d524df2c001ee51caa7f02b0fb98a74
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Thu, 5 Nov 2020 03:11:37 +0000 (12:11 +0900)]
configs: odroid-n2: fix ENV_SIZE and other configs
Fix ENV_SIZE and other configs.
- Change from 0x2000 to 0x4000
- SYS_MMC_ENV_DEV/PART is set to 1
Change-Id: I3048e7a2838a6ce46c8986685791309619e66028
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Wed, 4 Nov 2020 01:24:42 +0000 (10:24 +0900)]
configs: khadas-vim3: fix ENV_SIZE and other configs
Fix ENV_SIZE and other configs.
- Change from 0x2000 to 0x4000
- SYS_MMC_ENV_DEV/PART is set to 1
Change-Id: I094c493e374017deeaa413404fa8445b31c255c6
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Mon, 2 Nov 2020 00:03:01 +0000 (09:03 +0900)]
samsung: tizen_amlogic: add TIZEN_BOOT_PREFIX to load script
Add TIZEN_BOOT_PREFIX to load a boot script.
Change-Id: Ie309ebc86baf9558070e0b56c973d7661f1d9d99
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Sun, 1 Nov 2020 23:56:31 +0000 (08:56 +0900)]
configs: meson64: relocate a config_distro_bootcmd header
Relocate a config_distor_bootcmd header before setting
CONGIT_EXTRA_ENV_SETTING.
Change-Id: I84272c9292c32c40d96693d622be31e9e7ac59c4
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Sun, 1 Nov 2020 23:43:07 +0000 (08:43 +0900)]
ARM: meson: Kconfig: Add Tizen specific configuration
Add Tizen Specific configuratoin.
- Enable tizen configuration to distinguish which board is used.
Change-Id: I09329b59cb7c2c47f72198a4bebde6ee511ffc7b
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Sun, 1 Nov 2020 23:41:13 +0000 (08:41 +0900)]
board: amlogic: change a prefixes to search image files
Change a prefixes to search image files.
- odroid-n2 : under odroid-n2 directory
- kvim3 : under vim3 directory
Change-Id: I86c2461b328e53f0b80979618acb2082bc82e9cc
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Sun, 1 Nov 2020 23:39:11 +0000 (08:39 +0900)]
packaging: add directory about each targets
Add directory about each targets.
- odroid-n2 / vim3
- The images of each targets will be located into there.
Change-Id: I2453d508975e2127fc66c500bfd1cf71b1fbd5ad
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Fri, 30 Oct 2020 11:12:07 +0000 (20:12 +0900)]
samsung: tizen_amlogic: update dfu_alt_system information
Update dfu_alt_system information.
Each files can be flashed to proper folder.
Change-Id: Ie2801e0e811ed8d191bfc70d5831c5d25d10454d
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Fri, 30 Oct 2020 09:55:27 +0000 (18:55 +0900)]
configs: khadas-vim3: enable persistent env on first FAT partition
This allows to save the environment variables (i.e. ipaddr, serverip, and so on) on the eMMC.
Change-Id: I72d80045aa3891acc01fd41821b9a344b92a5661
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Marek Szyprowski [Fri, 30 Oct 2020 09:29:10 +0000 (18:29 +0900)]
configs: odroid-n2: enable persistent env on first FAT partition
This allows to save the environment variables (i.e. ipaddr, serverip, and so on) on the eMMC.
Change-Id: I22f04cc7654ccd7e88f6c715df167cacd4b538ea
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Fri, 30 Oct 2020 07:22:32 +0000 (16:22 +0900)]
board: amlogic: add a skip layout in dfu_boot_info
Add a "skip" layout in dfu_boot_info.
- kvim3 target: u-boot-n2.bin will be skipped.
- odroid-n2 target: u-boot-kvim3.bin will be skipped.
Change-Id: I2a81f88c1610d3e5a13e560a4d5cc6c2322df538
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Fri, 30 Oct 2020 06:45:25 +0000 (15:45 +0900)]
dfu: add DFU_SKIP layout concept
Add DFU_SKIP layout concept.
If layout is "skip", it will be skipped after nothing to do.
- Add information into dfu_alt info
e.g) "u-boot.bin skip 0 0"
Change-Id: I96af2630ffabe87b71e514cad7bcc3513f221159
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Fri, 30 Oct 2020 03:00:03 +0000 (12:00 +0900)]
board: amlogic: remove CONFIG_ prefix about dfu information
Remove CONFIG_ prefix about dfu information.
Change-Id: I733ff160fa98ac0f70b8d76a0f17fb1d463724f5
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Thu, 29 Oct 2020 23:10:38 +0000 (08:10 +0900)]
packaging: add amlogic boards spec files
Add amlogic boards spec files.
- u-boot-kvim3 : Khadas VIM3
- u-boot-n2 : Odroid N2
Change-Id: I77da10475a692be348be094df592141f1e6d4088
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Tue, 27 Oct 2020 08:13:22 +0000 (17:13 +0900)]
board: amlogic: add set_dfu_alt_info in odroid-n2.c
Add set_dfu_alt_info in odroid-n2.c.
Change-Id: Ic705a38a221af7dfcdb5a67321739c84a79f61df
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Tue, 26 May 2020 07:22:32 +0000 (16:22 +0900)]
configs: khadas-vim3: enable FAT_WRITE config
Enable FAT_WRITE configuration.
Change-Id: I5226a34965ef402639865fffbb8f24ba4c7449e1
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Tue, 26 May 2020 06:55:13 +0000 (15:55 +0900)]
samsung: tizen_amlogic: add kvim3_linux.dtb into dfu_info
Add kvim3_linux.dtb in dfu_inf.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Tue, 26 May 2020 04:15:51 +0000 (13:15 +0900)]
configs: khadas-vim3: enable configs relevant to video
Enable configs relevant to video.
- Before enabled this, it was occurred panic during kernel booting.
Change-Id: I97fe4d440c057a04f92ea16c3551072b74ae0ce7
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Tue, 26 May 2020 04:00:16 +0000 (13:00 +0900)]
configs: khadas-vim3: enable configs relevant to thor command
Enable configs relevant to thor command.
Change-Id: Ib77bf6ae5f5878dfcadb680af6d2017c983e4400
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Jaehoon Chung [Tue, 26 May 2020 03:35:55 +0000 (12:35 +0900)]
arm: dts: meson-khadas-vim3: disable sdio interface
Disable sdio interface for WiFi.
U-boot doesn't support Wifi.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>