Skip to content

Commit

Permalink
. 支持http网起
Browse files Browse the repository at this point in the history
  • Loading branch information
yaya2007 committed Dec 16, 2024
1 parent 9115ba9 commit c0655e7
Show file tree
Hide file tree
Showing 13 changed files with 3,645 additions and 1,172 deletions.
7 changes: 7 additions & 0 deletions ChangeLog_UEFI.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
更新说明:
2024-12-16 (yaya)
支持http网起。
例如:map (http)/imgs/pe.iso (cd)
chainloader (cd-1)
boor
例如:/efi/grub/ext/ntboot (http)/imgs/pe.wim

2024-09-01 (yaya)
修正函数 map --unmap=
增加参数 map --alloc-only,用于批处理分配自由内存。
Expand Down
9 changes: 9 additions & 0 deletions menu.lst
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,15 @@ title 使用外部命令 NTBOOT 启动 Windows 系统
/efi/grub/ext/ntboot (hdx,y)/win
boot

title 使用 http 网起 iso 或者 img 镜象
map (http)/imgs/pe.iso (cd)
chainloader (cd-1)
boor

title 使用 http 及外部命令 NTBOOT 网启 wim 镜象
/efi/grub/ext/ntboot (http)/imgs/pe.wim
boot

title 命令行
commandline

Expand Down
22 changes: 13 additions & 9 deletions stage2/asm.S
Original file line number Diff line number Diff line change
Expand Up @@ -527,12 +527,12 @@ VARIABLE(pxe_tftp_open) //PXENV_TFTP_OPEN_t
.space 128 # FileName[128]; 文件名
.word 0 # TFTPPort TFTP端口
.word 0 # PacketSize 包尺寸

/*
//boot.c
.align 8
VARIABLE(mbi) //multiboot_info
.space (22 * 4)

*/

/****************************************************************************/
/************************* 32-bit functions follow **************************/
Expand Down Expand Up @@ -656,7 +656,7 @@ VARIABLE(system_functions) //IMG(0x8300)
.extent ABS(EXT_C(dir)) //61
.extent ABS(EXT_C(print_a_completion)) //62
.extent ABS(EXT_C(print_completions)) //63
.extent ABS(EXT_C(devread)) //64
.extent 0 //64
.extent ABS(EXT_C(probe_bpb)) //65
.extent ABS(EXT_C(probe_mbr)) //66
.extent ABS(EXT_C(unicode_to_utf8)) //67
Expand Down Expand Up @@ -726,7 +726,7 @@ VARIABLE(filesystem_type) //13 int
//VARIABLE(query_block_entries)
.extent ABS(EXT_C(grub_efi_image_handle)) //14 void *
//VARIABLE(map_start_sector)
.extent ABS(EXT_C(grub_efi_system_table)) //15 struct grub_efi_system_table
.extent ABS(EXT_C(grub_efi_system_table)) //15 grub_efi_system_table *
.extent ABS(EXT_C(buf_geom)) //16 geometry
.extent ABS(EXT_C(tmp_geom)) //17 geometry
VARIABLE(CONFIG_ENTRIES) //18 char *
Expand All @@ -752,16 +752,20 @@ VARIABLE(graphics_CURSOR) //28 void *
.extent (EXT_C(menu_border)) //29 border 数组
VARIABLE(gzip_filemax) //30 long long
.extent 0
.extent ABS(EXT_C(WENV_ENVI)) //31 char *
.extent ABS(EXT_C(WENV_ENVI)) //31 char * (实际是char **)!!!
//reserved for wee
VARIABLE(bat_md_start) //32 grub_size_t
.extent 0
VARIABLE(bat_md_count) //33 unsigned int
.extent 0
.extent 0 //34 reserved
.extent 0 //35 reserved
.extent 0 //36 reserved
.extent 0 //37 reserved
VARIABLE(ext_data_0) //34 unsigned long long
.extent 0
VARIABLE(ext_data_1) //35 unsigned long long
.extent 0
VARIABLE(map_start_sector) //36 unsigned long long*
.extent 0
VARIABLE(map_num_sectors) //37 unsigned long long*
.extent 0
.extent 0 //38 reserved
.extent 0 //39 reserved
.extent 0 //40 reserved
Expand Down
2 changes: 2 additions & 0 deletions stage2/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -1185,6 +1185,7 @@ load_initrd (char *initrd)
void
bsd_boot (kernel_t type, int bootdev, char *arg)
{
#if 0
char *str;
int clval = 0, i;

Expand Down Expand Up @@ -1321,4 +1322,5 @@ bsd_boot (kernel_t type, int bootdev, char *arg)
//(*entry_addr) (clval, bootdev, 0, end_mark, extended_memory, (*(unsigned short *)0x413)/*saved_mem_lower*/);
//multi_boot ((int) entry_addr, clval, bootdev, 0, end_mark, extended_memory, (*(unsigned short *)0x413)/*saved_mem_lower*/);
}
#endif
}
Loading

0 comments on commit c0655e7

Please sign in to comment.