aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/configs/nokia_rx51.h174
-rw-r--r--include/env/ti/ti_common.env10
-rw-r--r--include/expo.h2
-rw-r--r--include/spl.h2
-rw-r--r--include/timer.h6
5 files changed, 10 insertions, 184 deletions
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
deleted file mode 100644
index 54eea322dd..0000000000
--- a/include/configs/nokia_rx51.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2011-2012
- * Pali Rohár <pali@kernel.org>
- *
- * (C) Copyright 2010
- * Alistair Buxton <a.j.buxton@gmail.com>
- *
- * Derived from Beagle Board code:
- * (C) Copyright 2006-2008
- * Texas Instruments.
- * Richard Woodruff <r-woodruff2@ti.com>
- * Syed Mohammed Khasim <x0khasim@ti.com>
- *
- * Configuration settings for the Nokia RX-51 aka N900.
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * High Level Configuration Options
- */
-
-#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap.h>
-#include <asm/arch/mem.h>
-#include <linux/stringify.h>
-
-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
-/*
- * Hardware drivers
- */
-
-/*
- * NS16550 Configuration
- */
-#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */
-
-#define CFG_SYS_NS16550_CLK V_NS16550_CLK
-
-/*
- * select serial console configuration
- */
-#define CFG_SYS_NS16550_COM3 OMAP34XX_UART3
-
-#define CFG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }
-
-#define GPIO_SLIDE 71
-
-/*
- * Board ONENAND Info.
- */
-
-#define CFG_SYS_ONENAND_BASE ONENAND_MAP
-
-/* Environment information */
-#define CFG_EXTRA_ENV_SETTINGS \
- "usbtty=cdc_acm\0" \
- "stdin=usbtty,serial,keyboard\0" \
- "stdout=usbtty,serial,vidconsole\0" \
- "stderr=usbtty,serial,vidconsole\0" \
- "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \
- "switchmmc=mmc dev ${mmcnum}\0" \
- "kernaddr=0x82008000\0" \
- "initrdaddr=0x84008000\0" \
- "scriptaddr=0x86008000\0" \
- "fileloadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
- "fileload=${mmctype}load mmc ${mmcnum}:${mmcpart} " \
- "${fileloadaddr} ${mmcfile}\0" \
- "kernload=setenv fileloadaddr ${kernaddr};" \
- "setenv mmcfile ${mmckernfile};" \
- "run fileload\0" \
- "initrdload=setenv fileloadaddr ${initrdaddr};" \
- "setenv mmcfile ${mmcinitrdfile};" \
- "run fileload\0" \
- "scriptload=setenv fileloadaddr ${scriptaddr};" \
- "setenv mmcfile ${mmcscriptfile};" \
- "run fileload\0" \
- "scriptboot=echo Running ${mmcscriptfile} from mmc " \
- "${mmcnum}:${mmcpart} ...; source ${scriptaddr}\0" \
- "kernboot=echo Booting ${mmckernfile} from mmc " \
- "${mmcnum}:${mmcpart} ...; bootm ${kernaddr} || " \
- "bootz ${kernaddr}\0" \
- "kerninitrdboot=echo Booting ${mmckernfile} ${mmcinitrdfile} from mmc "\
- "${mmcnum}:${mmcpart} ...; bootm ${kernaddr} ${initrdaddr} || " \
- "bootz ${kernaddr} ${initrdaddr}\0" \
- "attachboot=echo Booting attached kernel image ...;" \
- "setenv setup_omap_atag 1;" \
- "bootm ${attkernaddr} || bootz ${attkernaddr};" \
- "setenv setup_omap_atag\0" \
- "trymmcscriptboot=run switchmmc && run scriptload && run scriptboot\0" \
- "trymmckernboot=run switchmmc && run kernload && run kernboot\0" \
- "trymmckerninitrdboot=run switchmmc && run initrdload && " \
- "run kernload && run kerninitrdboot\0" \
- "trymmcpartboot=setenv mmcscriptfile boot.scr; run trymmcscriptboot;" \
- "setenv mmckernfile uImage; run trymmckernboot;" \
- "setenv mmckernfile zImage; run trymmckernboot\0" \
- "trymmcallpartboot=setenv mmcpart 1; run trymmcpartboot;" \
- "setenv mmcpart 2; run trymmcpartboot;" \
- "setenv mmcpart 3; run trymmcpartboot;" \
- "setenv mmcpart 4; run trymmcpartboot\0" \
- "trymmcboot=if run switchmmc; then " \
- "setenv mmctype fat;" \
- "run trymmcallpartboot;" \
- "setenv mmctype ext4;" \
- "run trymmcallpartboot;" \
- "fi\0" \
- "emmcboot=setenv mmcnum 1; run trymmcboot\0" \
- "sdboot=setenv mmcnum 0; run trymmcboot\0" \
- "trymmcbootmenu=setenv mmctype fat && run trymmcscriptboot || " \
- "setenv mmctype ext4 && run trymmcscriptboot\0" \
- "preboot=setenv mmcpart 1; setenv mmcscriptfile bootmenu.scr;" \
- "setenv mmcnum 0 && run trymmcbootmenu || " \
- "setenv mmcnum 1 && run trymmcbootmenu;" \
- "if run slide; then true; else " \
- "setenv bootmenu_delay 0;" \
- "setenv bootdelay 0;" \
- "fi\0" \
- "menucmd=bootmenu\0" \
- "bootmenu_0=Attached kernel=run attachboot\0" \
- "bootmenu_1=Internal eMMC=run emmcboot\0" \
- "bootmenu_2=External SD card=run sdboot\0" \
- "bootmenu_3=U-Boot boot order=boot\0" \
- "bootmenu_delay=30\0" \
- ""
-
-#define CFG_POSTBOOTMENU \
- "echo;" \
- "echo Extra commands:;" \
- "echo run sdboot - Boot from SD card slot.;" \
- "echo run emmcboot - Boot internal eMMC memory.;" \
- "echo run attachboot - Boot attached kernel image.;" \
- "echo"
-
-/*
- * OMAP3 has 12 GP timers, they can be driven by the system clock
- * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK).
- * This rate is divided by a local divisor.
- */
-#define CFG_SYS_TIMERBASE (OMAP34XX_GPT2)
-
-/*
- * Physical Memory Map
- */
-#define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0
-
-/*
- * FLASH and environment organization
- */
-
-#define CFG_SYS_SDRAM_BASE PHYS_SDRAM_1
-#define CFG_SYS_INIT_RAM_ADDR 0x4020f800
-#define CFG_SYS_INIT_RAM_SIZE 0x800
-
-/*
- * Attached kernel image
- */
-
-#define SDRAM_SIZE 0x10000000 /* 256 MB */
-#define SDRAM_END (CFG_SYS_SDRAM_BASE + SDRAM_SIZE)
-
-#define IMAGE_MAXSIZE 0x1FF800 /* 2 MB - 2 kB */
-#define KERNEL_OFFSET 0x40000 /* 256 kB */
-#define KERNEL_MAXSIZE (IMAGE_MAXSIZE-KERNEL_OFFSET)
-#define KERNEL_ADDRESS (SDRAM_END-KERNEL_MAXSIZE)
-
-/* Reserve protected RAM for attached kernel */
-#define CFG_PRAM ((KERNEL_MAXSIZE >> 10)+1)
-
-#endif /* __CONFIG_H */
diff --git a/include/env/ti/ti_common.env b/include/env/ti/ti_common.env
index e87a41a659..f5d84216e3 100644
--- a/include/env/ti/ti_common.env
+++ b/include/env/ti/ti_common.env
@@ -15,10 +15,10 @@ boot_fit=0
addr_fit=0x90000000
name_fit=fitImage
update_to_fit=setenv loadaddr ${addr_fit}; setenv bootfile ${name_fit}
-get_overlaystring=
- for overlay in $name_overlays;
- do;
- setenv overlaystring ${overlaystring}'#'${overlay};
+get_fit_overlaystring=
+ for overlay in $name_overlays; do;
+ setexpr name_fit_overlay gsub / _ conf-${overlay};
+ setenv overlaystring ${overlaystring}'#'${name_fit_overlay};
done;
get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile}
run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring}
@@ -28,7 +28,7 @@ bootcmd_ti_mmc=
run main_cpsw0_qsgmii_phyinit; run boot_rprocs;
#endif
if test ${boot_fit} -eq 1;
- then run get_fit_${boot}; run get_overlaystring; run run_fit;
+ then run get_fit_${boot}; run get_fit_overlaystring; run run_fit;
else;
run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern;
fi;
diff --git a/include/expo.h b/include/expo.h
index a2b3a71c15..9d2e817eb9 100644
--- a/include/expo.h
+++ b/include/expo.h
@@ -670,7 +670,7 @@ int expo_apply_theme(struct expo *exp, ofnode node);
*
* Build a complete expo from a description in the provided devicetree.
*
- * See doc/developer/expo.rst for a description of the format
+ * See doc/develop/expo.rst for a description of the format
*
* @root: Root node for expo description
* @expp: Returns the new expo
diff --git a/include/spl.h b/include/spl.h
index 57da1484f0..0fedddd00e 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -862,7 +862,7 @@ void __noreturn spl_optee_entry(void *arg0, void *arg1, void *arg2, void *arg3);
/**
* spl_invoke_opensbi - boot using a RISC-V OpenSBI image
*/
-void spl_invoke_opensbi(struct spl_image_info *spl_image);
+void __noreturn spl_invoke_opensbi(struct spl_image_info *spl_image);
/**
* board_return_to_bootrom - allow for boards to continue with the boot ROM
diff --git a/include/timer.h b/include/timer.h
index 311ce6b2c3..091d8dfa22 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -55,10 +55,10 @@ u64 timer_conv_64(u32 count);
int timer_get_count(struct udevice *dev, u64 *count);
/**
- * timer_get_rate() - Get the timer input clock frequency
+ * timer_get_rate() - Get the timer input clock frequency in Hz
* @dev: The timer device
*
- * Return: the timer input clock frequency
+ * Return: the timer input clock frequency in Hz
*/
unsigned long timer_get_rate(struct udevice *dev);
@@ -87,7 +87,7 @@ struct timer_ops {
/**
* struct timer_dev_priv - information about a device used by the uclass
*
- * @clock_rate: the timer input clock frequency
+ * @clock_rate: the timer input clock frequency in Hz
*/
struct timer_dev_priv {
unsigned long clock_rate;
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-11 09:38:28 +0000