diff options
| author | Simon Shields <simon@lineageos.org> | 2018-06-17 00:22:44 +1000 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-03-28 01:14:53 +0100 |
| commit | 1392932fc8b3838508480329d40d0a44be363233 (patch) | |
| tree | a892c96b0f0060cef31e5c41798e4edaf9d7fe9a /board | |
| parent | eaffd3595755961ef57c39b2f80cdbd4845bb032 (diff) | |
| download | u-boot-midas-1392932fc8b3838508480329d40d0a44be363233.tar.gz u-boot-midas-1392932fc8b3838508480329d40d0a44be363233.tar.bz2 u-boot-midas-1392932fc8b3838508480329d40d0a44be363233.zip | |
i9300: remove secure-firmware node from FDT
The proprietary bootloader loads a TrustZone environment which the
kernel needs to interface with for things like system suspend. Under
u-boot, this firmware is not used - so we need to remove the
corresponding node so that the kernel does not attempt to access the TZ
that isn't running.
Diffstat (limited to 'board')
| -rw-r--r-- | board/samsung/i9300/i9300.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/board/samsung/i9300/i9300.c b/board/samsung/i9300/i9300.c index 3550c0eab7..8dfc9b682d 100644 --- a/board/samsung/i9300/i9300.c +++ b/board/samsung/i9300/i9300.c @@ -301,7 +301,6 @@ int board_usb_cleanup(int index, enum usb_init_type init) #ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup(void *blob, bd_t *bd) { -#if 0 int ret; /* we don't want the OS to think we're running under secure firmware */ int offs = fdt_node_offset_by_compatible(blob, 0, "samsung,secure-firmware"); @@ -315,14 +314,13 @@ int ft_board_setup(void *blob, bd_t *bd) } /* delete the node */ - ret = fdt_setprop_string(blob, offs, "test", "blah"); + ret = fdt_del_node(blob, offs); if (ret < 0) { printf("%s: failed to remove secure firmware node: %d\n", __func__, ret); return -EINVAL; } printf("FDT set up for OS %p\n", blob); -#endif return 0; } #endif |