diff --git a/projects/Amlogic/devices/AMLGX/bootloader/scripts/aml_autoscript.src b/projects/Amlogic/bootloader/scripts/aml_autoscript.src similarity index 100% rename from projects/Amlogic/devices/AMLGX/bootloader/scripts/aml_autoscript.src rename to projects/Amlogic/bootloader/scripts/aml_autoscript.src diff --git a/projects/Amlogic/devices/AMLGX/bootloader/scripts/boot.scr.src b/projects/Amlogic/bootloader/scripts/boot.scr.src similarity index 100% rename from projects/Amlogic/devices/AMLGX/bootloader/scripts/boot.scr.src rename to projects/Amlogic/bootloader/scripts/boot.scr.src diff --git a/projects/Amlogic/devices/AMLGX/bootloader/scripts/emmc_autoscript.src b/projects/Amlogic/bootloader/scripts/emmc_autoscript.src similarity index 95% rename from projects/Amlogic/devices/AMLGX/bootloader/scripts/emmc_autoscript.src rename to projects/Amlogic/bootloader/scripts/emmc_autoscript.src index 8defda50a7..4d16dbc0a9 100644 --- a/projects/Amlogic/devices/AMLGX/bootloader/scripts/emmc_autoscript.src +++ b/projects/Amlogic/bootloader/scripts/emmc_autoscript.src @@ -1,4 +1,4 @@ -setenv env_addr 0x10400000 +setenv env_addr 0x1040000 setenv boot_start 'bootm ${loadaddr} - ${dtb_mem_addr}' setenv addmac 'if printenv mac; then setenv bootargs ${bootargs} mac=${mac}; elif printenv eth_mac; then setenv bootargs ${bootargs} mac=${eth_mac}; fi' setenv try_boot_start 'if fatload ${devtype} ${devnum} ${loadaddr} KERNEL; then fatload ${devtype} ${devnum} ${env_addr} uEnv.ini && env import -t ${env_addr} ${filesize} && run addmac; fatload ${devtype} ${devnum} ${dtb_mem_addr} ${dtb_name} && run boot_start; fi' diff --git a/projects/Amlogic/devices/AMLGX/bootloader/scripts/s905_autoscript.src b/projects/Amlogic/bootloader/scripts/s905_autoscript.src similarity index 95% rename from projects/Amlogic/devices/AMLGX/bootloader/scripts/s905_autoscript.src rename to projects/Amlogic/bootloader/scripts/s905_autoscript.src index 8d5ce2615a..538c810736 100644 --- a/projects/Amlogic/devices/AMLGX/bootloader/scripts/s905_autoscript.src +++ b/projects/Amlogic/bootloader/scripts/s905_autoscript.src @@ -1,4 +1,4 @@ -setenv env_addr 0x10400000 +setenv env_addr 0x1040000 setenv boot_start 'bootm ${loadaddr} - ${dtb_mem_addr}' setenv addmac 'if printenv mac; then setenv bootargs ${bootargs} mac=${mac}; elif printenv eth_mac; then setenv bootargs ${bootargs} mac=${eth_mac}; fi' setenv try_boot_start 'if fatload ${devtype} ${devnum} ${loadaddr} KERNEL; then fatload ${devtype} ${devnum} ${env_addr} uEnv.ini && env import -t ${env_addr} ${filesize} && run addmac; fatload ${devtype} ${devnum} ${dtb_mem_addr} ${dtb_name} && run boot_start; fi' diff --git a/projects/Amlogic/devices/AMLG12/bootloader b/projects/Amlogic/devices/AMLG12/bootloader deleted file mode 120000 index 8c1b9cac7c..0000000000 --- a/projects/Amlogic/devices/AMLG12/bootloader +++ /dev/null @@ -1 +0,0 @@ -../AMLGX/bootloader \ No newline at end of file