Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[driver] using union to handle reg, [board] fix 100ask ros extlinux boot #122

Merged
merged 4 commits into from
Jul 9, 2024
Merged

[driver] using union to handle reg, [board] fix 100ask ros extlinux boot #122

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7232706
[driver] using union to handle reg
Jul 8, 2024
54bee29
[board] add a support
Jul 9, 2024
23316e2
Merge pull request #121 from YuzukiHD/main
SamulKyull Jul 9, 2024
4f3c67b
[board] fix 100ask ros extlinux boot
Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
[board] fix 100ask ros extlinux boot
  • Loading branch information
SamulKyull authored and SamulKyull committed Jul 9, 2024
commit 4f3c67b12b0ae74295131cd9d6966f5f72ebfb54
2 changes: 1 addition & 1 deletion board/100ask-ros/extlinux_boot/extlinux/extlinux.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ label Ubuntu-22.04
kernel /Image
initrd /initrd.img
fdt /sunxi.dtb
append earlycon=uart8250,mmio32,0x02500000 clk_ignore_unused initcall_debug=0 console=ttyAS0,115200 loglevel=8 root=/dev/mmcblk0p2 rootwait init=/init rdinit=/rdinit partitions=boot@mmcblk0p1:rootfs@mmcblk0p2:boot-resource@mmcblk0p3:env@mmcblk0p4:env-redund@mmcblk0p5:boottone@mmcblk0p6:rootfs_data@mmcblk0p7:private@mmcblk0p8:UDISK@mmcblk0p9 cma=64M snum=81275688b1c2489200e mac_addr= wifi_mac= bt_mac= selinux=0 specialstr= gpt=1 androidboot.mode=normal boot_type=2 gpt=1 uboot_message=2018 mbr_offset=1032192 bootreason=unknow
append earlycon=uart8250,mmio32,0x05000000 clk_ignore_unused initcall_debug=0 console=ttyAS0,115200 loglevel=8 root=/dev/mmcblk0p2 rootwait init=/init rdinit=/rdinit
25 changes: 11 additions & 14 deletions board/100ask-ros/extlinux_boot/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ extern int ar100s_gpu_fix(void);

typedef struct atf_head {
uint32_t jump_instruction; /* jumping to real code */
uint8_t magic[8]; /* magic */
uint8_t magic[8]; /* ="u-boot" */
uint32_t scp_base; /* scp openrisc core bin */
uint32_t next_boot_base; /* next boot base for uboot */
uint32_t nos_base; /* ARM SVC RUNOS base */
uint32_t secureos_base; /* optee base */
Expand Down Expand Up @@ -156,7 +157,7 @@ static int fatfs_loadimage_size(char *filename, BYTE *dest, uint32_t *file_size)
fret = f_close(&file);

printk_info("FATFS: read in %ums at %.2fMB/S\n", time,
(f32) (total_read / time) / 1024.0f);
(f32) (total_read / time) / 1024.0f);

open_fail:
return ret;
Expand All @@ -177,8 +178,8 @@ static int load_sdcard(image_info_t *image) {
sdmmc_blk_read(&card0, (uint8_t *) (SDRAM_BASE), 0, CONFIG_SDMMC_SPEED_TEST_SIZE);
test_time = time_ms() - start;
printk_debug("SDMMC: speedtest %uKB in %ums at %uKB/S\n",
(CONFIG_SDMMC_SPEED_TEST_SIZE * 512) / 1024, test_time,
(CONFIG_SDMMC_SPEED_TEST_SIZE * 512) / test_time);
(CONFIG_SDMMC_SPEED_TEST_SIZE * 512) / 1024, test_time,
(CONFIG_SDMMC_SPEED_TEST_SIZE * 512) / test_time);

start = time_ms();

Expand Down Expand Up @@ -507,7 +508,7 @@ static int load_extlinux(image_info_t *image, uint64_t dram_size) {
/* Append bootargs */
strcat(bootargs, data.append);

printk_info("Kernel cmdline = [%s]\n", bootargs);
printk_debug("Kernel cmdline = [%s]\n", bootargs);

/* Append bootargs mac address */
uint32_t chip_sid[4];
Expand All @@ -520,10 +521,6 @@ static int load_extlinux(image_info_t *image, uint64_t dram_size) {
char *mac0_address = get_mac_address_from_sid(chip_sid, mac_address_str);
strcat(bootargs, " mac0_addr=");
strcat(bootargs, mac0_address);
chip_sid[2]++;
char *mac1_address = get_mac_address_from_sid(chip_sid, mac_address_str);
strcat(bootargs, " mac1_addr=");
strcat(bootargs, mac1_address);

_add_dts_size:
/* Modify bootargs string */
Expand Down Expand Up @@ -596,7 +593,7 @@ static int abortboot_single_key(int bootdelay) {

int main(void) {
sunxi_serial_init(&uart_dbg);

ar100s_gpu_fix();

show_banner();
Expand All @@ -609,10 +606,13 @@ int main(void) {

pmu_axp2202_init(&i2c_pmu);

pmu_axp2202_set_vol(&i2c_pmu, "dcdc1", 1100, 1);
pmu_axp2202_set_vol(&i2c_pmu, "dcdc3", 1100, 1);

pmu_axp2202_dump(&i2c_pmu);

/* Initialize the DRAM and enable memory management unit (MMU). */
uint64_t dram_size = sunxi_dram_init(NULL);
uint64_t dram_size = sunxi_dram_init(&dram_para);

arm32_mmu_enable(SDRAM_BASE, dram_size);

Expand Down Expand Up @@ -667,9 +667,6 @@ int main(void) {
atf_head->dtb_base = (uint32_t) image.of_dest;
atf_head->nos_base = (uint32_t) image.kernel_dest;

/* Fill platform magic */
memcpy(atf_head->platform, CONFIG_PLATFORM_MAGIC, 8);

printk_info("ATF: Kernel addr: 0x%08x\n", atf_head->nos_base);
printk_info("ATF: Kernel DTB addr: 0x%08x\n", atf_head->dtb_base);

Expand Down
4 changes: 2 additions & 2 deletions board/100ask-ros/syter_boot/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#define CONFIG_BL31_FILENAME "bl31.bin"
#define CONFIG_BL31_LOAD_ADDR (0x48000000)

#define CONFIG_DTB_FILENAME "sunxi.dtb"
#define CONFIG_DTB_FILENAME "sun50i-r818-mg-core.dtb"
#define CONFIG_DTB_LOAD_ADDR (0x41f00000)

#define CONFIG_KERNEL_FILENAME "Image"
Expand Down Expand Up @@ -70,7 +70,7 @@ typedef struct atf_head {
uint64_t dtb_base; /* the address of dtb */
} atf_head_t;

#define FILENAME_MAX_LEN 16
#define FILENAME_MAX_LEN 32
typedef struct {
uint8_t *bl31_dest;
char bl31_filename[FILENAME_MAX_LEN];
Expand Down
5 changes: 3 additions & 2 deletions cmake/board/100ask-ros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ set(CONFIG_ARCH_ARM32_ARM64 True)
set(CONFIG_CHIP_SUN50IW10 True)
set(CONFIG_CHIP_WITHPMU True)
set(CONFIG_CHIP_GPIO_V1 True)
set(CONFIG_CHIP_MINSTACK True)
set(CONFIG_CHIP_MINSTACK False)

set(CONFIG_BOARD_100ASK_ROS True)

add_definitions(-DCONFIG_CHIP_SUN50IW10 -DCONFIG_CHIP_GPIO_V1)
add_definitions(-DCONFIG_CHIP_GPIO_V1)
add_definitions(-DCONFIG_CHIP_SUN50IW10)

set(CONFIG_USE_DRAM_PAYLOAD True)
set(CONFIG_USE_PREBUILT_DRAM_PAYLOAD True)
Expand Down
Loading