From e88f30567168865460108b1558f030b51080cbf3 Mon Sep 17 00:00:00 2001 From: klu2 Date: Mon, 22 Jun 2009 03:01:53 +0000 Subject: [PATCH] This patch includes: 1) Use the binaries of boot sector directly instead of building it. Because the code of boot sector will be modified rarely and it is native code. 2) Correct the shell binary file path which is changed by recently. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8620 6f19259b-4bc3-4df7-8a09-765794883524 --- DuetPkg/BootSector/bin/Gpt.com | Bin 0 -> 512 bytes DuetPkg/BootSector/bin/Mbr.com | Bin 0 -> 512 bytes DuetPkg/BootSector/bin/Readme.txt | 8 ++++++++ DuetPkg/BootSector/bin/St16_64.com | Bin 0 -> 4096 bytes DuetPkg/BootSector/bin/St32_64.com | Bin 0 -> 4096 bytes DuetPkg/BootSector/bin/Start.com | Bin 0 -> 4096 bytes DuetPkg/BootSector/bin/Start16.com | Bin 0 -> 4096 bytes DuetPkg/BootSector/bin/Start32.com | Bin 0 -> 4096 bytes DuetPkg/BootSector/bin/Start64.com | Bin 0 -> 4096 bytes DuetPkg/BootSector/bin/bootsect.com | Bin 0 -> 512 bytes DuetPkg/BootSector/bin/bs16.com | Bin 0 -> 512 bytes DuetPkg/BootSector/bin/bs32.com | Bin 0 -> 512 bytes DuetPkg/BootSector/bin/efi32.com | Bin 0 -> 139264 bytes DuetPkg/BootSector/bin/efi32.com2 | Bin 0 -> 4096 bytes DuetPkg/BootSector/bin/efi64.com | Bin 0 -> 139264 bytes DuetPkg/BootSector/bin/efi64.com2 | Bin 0 -> 4096 bytes DuetPkg/CreateBootDisk.bat | 27 ++++++++++++++------------- DuetPkg/CreateBootDisk.sh | 27 ++++++++++++++------------- DuetPkg/DuetPkg.dsc | 3 --- DuetPkg/PostBuild.bat | 16 +++++++--------- DuetPkg/PostBuild.sh | 26 +++++++++++++------------- 21 files changed, 56 insertions(+), 51 deletions(-) create mode 100644 DuetPkg/BootSector/bin/Gpt.com create mode 100644 DuetPkg/BootSector/bin/Mbr.com create mode 100644 DuetPkg/BootSector/bin/Readme.txt create mode 100644 DuetPkg/BootSector/bin/St16_64.com create mode 100644 DuetPkg/BootSector/bin/St32_64.com create mode 100644 DuetPkg/BootSector/bin/Start.com create mode 100644 DuetPkg/BootSector/bin/Start16.com create mode 100644 DuetPkg/BootSector/bin/Start32.com create mode 100644 DuetPkg/BootSector/bin/Start64.com create mode 100644 DuetPkg/BootSector/bin/bootsect.com create mode 100644 DuetPkg/BootSector/bin/bs16.com create mode 100644 DuetPkg/BootSector/bin/bs32.com create mode 100644 DuetPkg/BootSector/bin/efi32.com create mode 100644 DuetPkg/BootSector/bin/efi32.com2 create mode 100644 DuetPkg/BootSector/bin/efi64.com create mode 100644 DuetPkg/BootSector/bin/efi64.com2 diff --git a/DuetPkg/BootSector/bin/Gpt.com b/DuetPkg/BootSector/bin/Gpt.com new file mode 100644 index 0000000000000000000000000000000000000000..f055fd7428c5846383db21c865611223afa0f71c GIT binary patch literal 512 zcmdnNu%qw5jsxs{H+szq8Fz9q>|em}d8zS%-3&E*8QAt&FzjSt(mvN~)oajqq5E;) zfxa67;eS3aIcK;Ml$3^mW*arZW9N5pm zk+y@8fq@}y7m#4s&B(y^Vi^N_np&f+tDC0+f9rJyAiI_&z%eLa!mKFq*@$~=_u|8?c2h)Tv?`Plw8|@7=I*R!h z$asxnt%IdiV8i8qToNqJ2QfKzc{401O#v}^PTHNcE{z1)p#UU8RrWK~0L^&8!C-tK z0LTtMot7YHe6sH*Fc^Bbc`|myFm=|j^tiC4b-Hk*b%yY4ankDo`?*L&J}vRE0MOCM zUzpB5NF*yYpU;19g z(&fj{^@8gR&;?tVHZXR50=h%53v7B3hw*`c{R}nXrvr9?-JQSya`!ui{SJ%~FH9La zQUp3&gn*v-y!7=yUmho(ARYytV4f15M4lobsmKEpa|QB?c&vErfw1eyfj2BF{0&D8 kSPUBeSk^H&9AUSytYczfKg=*#K?8$JsA~x2t_xiS0HuR=NB{r; literal 0 HcmV?d00001 diff --git a/DuetPkg/BootSector/bin/Readme.txt b/DuetPkg/BootSector/bin/Readme.txt new file mode 100644 index 0000000000..55dd8cd666 --- /dev/null +++ b/DuetPkg/BootSector/bin/Readme.txt @@ -0,0 +1,8 @@ +These binaries are used to make the bootable floppy or usb disk. +The binaries of boot sector are built from DuetPkg\Bootsector\BootSector.inf at r8617 with following steps: +1) enter edk2 workspace directory from command line windows. +2) run "edksetup.bat" +3) run "build -p DuetPkg/DuetPkg.dsc -a IA32 -m DuetPkg/BootSector/BootSector.inf" + + + diff --git a/DuetPkg/BootSector/bin/St16_64.com b/DuetPkg/BootSector/bin/St16_64.com new file mode 100644 index 0000000000000000000000000000000000000000..dbb4a9af7eb295ad142cac778643858b9b106cdc GIT binary patch literal 4096 zcmeHIU2GIp6#iz0-EHk{hafdHA`DGaF^vXU(_pGZXj*F&)22UZF=w!yCc!)gAYb&eBp(CkT_c?&a$L5ZYBeLS|EW9C1vb{gxH5&D{(zjER+|F#5d>O z%-rvsbH8)X{pKX&y>|SqcYE62(KHQ@85CYU+IRK5+)R!s9O*JqXIP)k#w$}&xbegq zcw590KlZVVH-MBJ_fqh^qB>d*o2WG`cQ+zp?0Ga!0AlO~T4fAG%O*66HDY|`rHRwv zrUZtV5_>B}xeBFSAo5=nsiyQXSBhS7!K&h^A zWw9wo?75JVH7xyi#J}2?_3wRJN=M+qglSkme}}~%yg$2H8ylhdAw65zV?NtIg?dkV z4Q=cL*34dEJxpW0>;OB&;_M(zKY5J3&xYxU@fjm;SjMHZ1(l!ilk()wy;a=QT!QKK zzGJd;*Pd>>c7$>L;(D(Cftc)F=gBZ_Ybx>2cJ@{A=(X`2&&;ja&y#vgA#mCdj z_?(Zw?5hGysll#2w8_mPUU&OW>hk=sYa(8gx-mcGo}|y6<_7p`82Kqsmy;k7bVMy~o>e+Rpn6nkL&rr6Yh`q1)1Y#1 z4L8VzQug?pei08wxlHg22g~a>f3K_Tm5q)j=0l9kqop;p%rf)H9HS40Vl8j_~;4+;50(n5%kj!*s}-u0z_ zj4TcGCbyNA_Ms0&41Mv%dnj}-8r|zc3_X_BJe>;lFeR>81Zf^}M)CUF*x2-?(BPXp z!|r_NxAXnY%x4DH??3y_2R&`?X_|(07P77_?T32e%@mlzXI&=h4C~9;WMxK*HlE)A zf2UaHXFiv45Xi_$KZ77Ds^jITiCV+*4kISUTG2QGh_N>CvJe7 z5-_Ts=j!C$*GE{*j`SW`&c1^CB`iROHgrWo*JN20IlWlYOQl4g$mNQ1pLm$_DwVMs zoS836Ex#t%B^lA}F>fEud0lK1xxsf^ZYHCx?IQ2nt^M61uX}QHIrU>Tmgbapbc*Sv zIZ^2MDnK*%=LU}0LtGhKmguz&Ts#!{sVARuG0o$%T>WJbd};Bp7(~;p)|UKfS={U# zw{l)YFP>KH{iFCI^2R8d3jJNF-{P}NpUB;*KM7gt`-4b%Df?$x+;LtVdF`VCN_Cqn zi%ofQ&qWm5u=Gbres{zUHa;t5WAI_ZG_0%Vu=tbzw41fD5vnKX*~$LsJxpW0>^M8clI$eaz@K0rvti0IK4TON%ea2IsPaoeN}fLOVHGzuk7Rap5SZ*d z^nSNfJHohrZ8O&&BO&|0^K_JkHI?{R2l}db{PuXB=jJvXkkZ0ng66om_eI?M} z_EiC<)Zo;f+V0s%*4=xMxiLTNnMl@T?#vH)7m=;Qy$5%nEK}|UnMa~@8uX?M2m!bc4KzT3?mNV%@nOrcaxXI z4)Xdqy5inT?%m|(=2iqWjKUP?CKHetI^q^LFDo4p(0Wv9YsWPUn`Cs_S_wf{%+UwR|o!k+{M)}zK%VY*b5l{^bq#{Cy%x4LLCwa34{bf w0_!L6vj30PPcC$Z1VREKffqx-sc@Z2*V*VgRj$Kar`mODTt{`EW$(T47Ym1N`2YX_ literal 0 HcmV?d00001 diff --git a/DuetPkg/BootSector/bin/Start.com b/DuetPkg/BootSector/bin/Start.com new file mode 100644 index 0000000000000000000000000000000000000000..adc5a3d0cf52bc908ece2f15ece86af13e1f5dac GIT binary patch literal 4096 zcmeHGOGq0*82)!x6CYz%s1~G>u97Mxv`|yLShZFn^hs<~l!7Se^wbBM^wNih(14j3 z`k*~{D5cViryPVPTHB-nm4;>2lUAsqDZ01_QV&V3G@Z4rhzFskdf0#1`M>?&^X;s1 z=F#~pP1Z|-AizFC-MgisuIW?-HB7+0#vl~=!w=`2*#SmZ_9_FE60(V1_gOd#5MZ53 z08}fbC`eA4mi1SjUpOLXy5oIZw7MT2WS-~;^L%Tg_oHPl zd55)ozfqdJ&rRT!z0pyYEQyDDj$CV_r4})_VUE%4L?##Yhuz=7`K&W)I67E4!i4mo zKoEld@cWmr@ml$5M^@BB*Dd;#pnbm8Ke(Dl6q6O*K$Yk;YC-~PMmJF}a-!RGseK%% z8+FlczG?rwKkT1*8|U%3S|1PAlk!L3ch!bA}P8;+AcERmD$@dTMt?A)l%NV~YKY$wrVdiG{sJ z`2skLR@MTu%UyCUI1PcNU==^B&X$)u#Xbfl!Xbfl!XbkLSK+KZFY)Q4l9(rn21(?l-*L?& FzW}{UIT`=} literal 0 HcmV?d00001 diff --git a/DuetPkg/BootSector/bin/Start16.com b/DuetPkg/BootSector/bin/Start16.com new file mode 100644 index 0000000000000000000000000000000000000000..34e5dca6dbfed6ece0d4b679decdb14a59c9f73f GIT binary patch literal 4096 zcmeH`Ur19?9LImVS2zD0Hz5rqSyvfJjDlJW!qQ9>`paxilt2{h^wb}8>!m*`qk%iy zh@u{Rh)R0#X%9hnnswJgrE$6HlP2V7p%*WLw1+K|*11+9KKRl@KHT5op5OQW&Y$1! zeD1l*i3evcHaDE-I1Y9&I=s~y>za?)XAq8>oJ8BtRnK|!^^GL1 ze5h}AlDJo9j%NK&iy)n38^J-w(@8ShD(3-BpgeEujCEkvx2B_AIbgC%;$!Q#F&W3U z8Eksp4mh1UP1?cwslGbi%aA!oK#0n@-b61OJJ|>Kau4-^b+)z1|Is#+zQs8G-zXOU z6ASodf9w@Q7Q{W>`!2W9t>!VCvc~D^WG)*E3EuDEdE6N@?ho1rbrAz7zylu=-aUiV zOXa5%HK1VaPSCSQ^kZWJkwPGvbg7T}M60gKpBM=5?bhsEcL~OonDd zLTKtu!h}cFd^lKBX}~-uQyD2y10#;Q3r?}L8)5H63HJT~H=}&UK|P&j&ESC=vjN-Y z192Qp=3K==Z!t^P3?Ww4EgSlhsvnsRG~OSBV(JFW8RoAhDPCt0OMA@nS@4uCt%Ro+ zyX0E%7{d#T9kLxFWw5mJWql2sbbAX}+M6A$i4%~{R4HISPpxna=#^B$#A?-ZZCW-<-Eo2EdDy4X)ZNzF(r&AxfoZtgCO}0v_F&#y7-0;xFY-XGBAa;l9t+I? z5!S0lK#P(RTh1Urc{rvV10(U

_;__#M=<&}GXBz|(KV5S%?R_8QiJ1-|Dk18tKz zGl~0>Szk8m=_K)ZlILWKvu!ILU`hiY&O50-!6Xqg}mX59a)v4DBiblMRxX-nxUy2W*?i z=80~=ne-Xb4c5>0hQuIC7M;OZT*>z(2RZTd5Zuo{J_ObUcU$12Z9a3Gbp^gtE`g`b z5Ksc*E0!!vhx(6P>7r9DVJ>Y=(Ckz`Cx&CbAK-n`E1Hgm>L-|}5mXRB2*=)yLi(lp z%Y_`MpSGLysY3faIDn3EwZ?(2qk41_wId#Npc`ladC@J}w5dJlD(a&P1ZTqw;aGU? zP11~~wAFB^vD%0QUZFBtrUfRQEf-x)e zp31w1L%vdu=8Pdu)1BM;vZfzfj5IzhLMe44mMr^EleECpNaX_-WUf8m#R!#Ha+NW~CHji)~1ZXeA*ZBnlyg^!CYG(p_Kt zXu@K^z1guU`rv~|gD-vQK2)4dn>y=a8eE2H^0c*Jm#(B^hC(q9iLtnzNllGD6fC|u z_cC+;=iGbFocYax@t!;N;w!!FFYCIFdkos%JUR~aKGQ;u8NA(XqTaCHTZmVsm2lJP z3V6HZnizja#q&T~jeBYMURe_@hfUNOmU|EpIq^7}rT{tdB&{k2qh%91?KNR??&+zo zAWQ`qLoa#lna1pj&n zVrBWD976LCZLRr}s=U%QX=U9|qIgov?Hj|pp{K^sTo~w1eji;}c~k94{z3$kpEe@t zCUfUhdCh)k^pV#FDb-b>EjQ;Wx)joKhL!jg@lOutd=B3!nFu_XFb(UQFR=Wj_j?a( zXQMRVplcVq$7lTKR^J(~v7Non_ONGJFVk5cJH}41I6F?$PZncG*a)SZoHGiBWn8{c zrja7*|@51#Wb(b6B z4Mh{E0&gf}#sG`AkhhZWrdSd?Db~Z$_2|76y_=$ixeY!Iqc8*Nasm=TXVenr1+6m# zs)sAvIxkt+qM|F80hRmHNTXU@&7FF|FXHYfmq~u)V151U&vlc%aq#cw&ThEzLFBH) zUcmUvLSX+(9-G+(Iv@}b2nYlO?w`Q_{eN`-Mau^({kYR6`d QUE|obj?JAr+567?0c<34l>h($ literal 0 HcmV?d00001 diff --git a/DuetPkg/BootSector/bin/bootsect.com b/DuetPkg/BootSector/bin/bootsect.com new file mode 100644 index 0000000000000000000000000000000000000000..079978e79e3d0bc0f4a4d47e0a482c854ae4e60f GIT binary patch literal 512 zcmaEDGr`j@#MMVZL4kpZk&%Jv0fPhg2Tled1||js&=hQtIpON&so>@qVrZlQqZE40 zwlcnW#n5x2?*c1>K;Ml$3^muz-)ha+ z-6zO!@F8pW&Bn+78Tnha7`tyCe9hU_Cct3yCurSc$Ejv!T{U{y|@ zex=;q*P9PXwcajadd=N@T%q};Lg}iPD;T;@_ncs5Q0O~g{J;BP^9v@U|6TKV8G^n) zj$(FWfN+lw)?)ztjixi_HfjVxdF@M%R-E-jJV^-$FeFvIu5LUna)D+{VWs$8P-p#WDuw!<}vn z#+Qt5r#0FFE%zyvO>3-WaS1XsD-{N^*ntjFDCO*qm1@0IqV?JsqAILZ9;C`K2q-5C zQl;SJ=~v3#eZBdRRO{^$rq|rf#}%4iDwM8zxq_klbk7M^28F%@#{atyHossp`rkE= zmm%o;<0xh~1_+1kg)BovXPYkLD_}S%>|of@cVNc>_P!fC*%|gPVEDZBa6%e$+b>2S zA;XZ?{h|Bx-apl8-N(|5FQxHsk7G#t{@F?Umb3NgdZzB1fnBGJFMTg#3hw%}m!YN$ z7)o6)x(;t)>b`$gxJWTN5~$;L8uMrE(>(_cK4xV;+;^b)CqwDF#KWz(`CEhj_nIAM pd{OiN^*<+`V4f15M4lobsmSBR;|gRI@#F)sA`c|ih$KT-0RSOAxpe>l literal 0 HcmV?d00001 diff --git a/DuetPkg/BootSector/bin/bs32.com b/DuetPkg/BootSector/bin/bs32.com new file mode 100644 index 0000000000000000000000000000000000000000..0255c82e890d4970c7a7ecdbc35fee416b3961ff GIT binary patch literal 512 zcmaDIF~QR>#MMVZL4kox0Mv>M+#ExUjer8ZW{(+P{9))h(RYEBL7?x(9)_CkH(NM5 zra3U26*fN5b?o1PfUbio_5qFi{xOEG;&1h3?Cuj}IQWpY`)1?g|BU>tHjLdj55DH? zY7<~Edh&gl3IlT+9|QB@PB(_`HXVlM7feR~yXNsSe1FXB#vsRT{Qt#52IEV{x6>MJ zUEMr=N@dd;Ygt@^j0{SJfh=|dpqolLyJMwVFO_J$HioDQE0qVSats2>iGoxqIC=V& za(7>EJ|xw8yM*aAck^+D=9dbkt6r{P=sw+Zf|Ws`?|||D?t^gagT6nG0y+TV7Pc3% z3=y4e(TuNvfvK>AVMpJA9S7L^ZtP@d*uQ|`^U}i!Y0PcE7=eTgLt6KT?$dk!RHt(gF_nl50tb-n01yoIUz{#oH7 z#pp<&j@xO>pS4f-960!xmHBYrf##nKrRx$8x8CM&4f@|}_L1>L&HvZ`oOptHN_Y}^ Vih!gdj}wn8kX6K!4~p&3RRHt3xn2MO literal 0 HcmV?d00001 diff --git a/DuetPkg/BootSector/bin/efi32.com b/DuetPkg/BootSector/bin/efi32.com new file mode 100644 index 0000000000000000000000000000000000000000..7c982e0ba7c344fd595d189e98bcf7eb93d9939f GIT binary patch literal 139264 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 literal 0 HcmV?d00001 diff --git a/DuetPkg/BootSector/bin/efi64.com2 b/DuetPkg/BootSector/bin/efi64.com2 new file mode 100644 index 0000000000000000000000000000000000000000..689f4ab4a36df7e86ae5c4fd623a572a133eb607 GIT binary patch literal 4096 zcmeIz{cl^<83*taJIzbe60Z#-C9s~*7Sce9o%AJvl;$RJ;*2JB;=DKwZQ?rDu~XL$ zj-7U!=-jy(372i?!2Fij8=UEUd0<>-|3(vXF zRp~GM15+dAJRg70x#t|8du^W?KPZm((KdrVxz6HOaWEK2`uo{jMir@!?>mfq;HUtPazyP5bdI)Qvjc_B_2_;ZVxCyEVH$yq$ zJ5Wkk3&jKug@jVbA>0CAn)E%dgU<=;VUe%_76`Y(yM)`|Z9*Aj2pb_uD2JB`x5EpB zJK$+T1w2aF1dkBzgb9Kben_yv7@-ml5UOC1uo?OYTcCrm60^K8Gs5eDIR z1Qnhl_~2KBAvi|x!-IqX93~7yjIbYqgdlhc2VgfL1nq<{I0z%KgK$4=B}AZtFbeAl zQ79qAU=?8u@(Bk4D|5DYxH`MKdlaYAu5>6arBmrrx|JS>_ObW?ACP2Ov5AStP!4T8 zju$u*7grrzF*9#omUSb3vso8QlCTExwm64_CYrLe*%^^7xCb^3MoL*foO;uRU;S0_$o9}&1N zOP-d|mv}!h@{1gdQuFfaS(%@wd_a7HNM>a8jvkFaCs&=5>7QkKng%+>8AK}nBb?wb zGJl40hxol5Iwzw?D5?{W%IJL=9oD1q2|4Fcbc!c%f)8bvmqu5Mpd7s@BPT^x(JP}* zWwf25GSP%cP0OqQE%ObObFoPdy)2_u6cvjS8JX~xNG##H`0gzt52Mt;QM@`&<{wd> zCoUk8D`j+!A|~FG(P|mZ=+XET7Lmaw#l~@hHL~ls)b)hydO>#8{kVW>UmQ7m0$-fO z9}w2Aw+`)Z4lPGaVvsnSH^uc^yYO-Ek=Z9O(*C{0Gh`jp*Duj20CyT{$PyVvbVykT*?<$NfomPPX?a+l8HQ?>Z1 zJKgSbIx;gBoYXNho&C^U{DZ=H+8V!9bJ!eD=T5A}VGHNoeZ6UC`xJj^MT*4>*vWV< zW4=lGU@lzLlU{dvePOn>w&t)YJ2zckUd~(EIytji{k$uV7XiChES} z5LXX*)sbi*9Fl3JpSQKPNLBfHeMI%_9|;FSQ5kIZ^IcfHzl-}y+ zEuk?_Ffho&Bi=Bsg5fr~z*xYm@=!R+J!76g(6cY7cU5CoI3{2CJh7lYdyStrghwJ_ zuR1y!j_^@+h=*~tNG!z5BI>9b8B+&0%4wCa*Xne+WK!?vE_LXDirbVcjmY7&w~E`YU^YBgB^VeA>HG2eRa_lYJl9r_*B=O}{7Qx=>}qLkyfRaTQ$K3^Rrh1Z z4nOY-?GJ?yhB)2^c^)J3xNP_>C;u9Z+G|v=QKLpp81-jHea5IMqrPL*OGaHOzoPK( zHlx-U)os*(QR7DawNZ~7^^8%uL)qC`TFT`ESjIN84#mBl@s0+)ZN#>tUZ=|`<9cj6 zTrHA~vb8ttYP4fi&1F=hw>B#VHk%A=m3mtxgUvd(V2jTJ22DGaX4iK8JzQ(9oxrsd NxOM{ncPG&G{8#+eIz|8h literal 0 HcmV?d00001 diff --git a/DuetPkg/CreateBootDisk.bat b/DuetPkg/CreateBootDisk.bat index 3e5272030a..2272a11dca 100644 --- a/DuetPkg/CreateBootDisk.bat +++ b/DuetPkg/CreateBootDisk.bat @@ -4,6 +4,7 @@ @set BASETOOLS_DIR=%WORKSPACE_TOOLS_PATH%\Bin\Win32 @set BUILD_DIR=%WORKSPACE%\Build\DuetPkg\DEBUG_MYTOOLS +@set BOOTSECTOR_BIN_DIR=%WORKSPACE%\DuetPkg\BootSector\bin @set DISK_LABEL=DUET @echo on @@ -28,13 +29,13 @@ goto Help @del FormatCommandInput.txt @echo Create boot sector ... %BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o FDBs.com -%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com %BUILD_DIR%\IA32\DuetPkg\BootSector\BootSector\OUTPUT\Bootsect.com -f +%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com %BOOTSECTOR_BIN_DIR%\Bootsect.com -f @REM @del FDBS.com -%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i %BUILD_DIR%\IA32\DuetPkg\BootSector\BootSector\OUTPUT\Bootsect.com +%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Bootsect.com @echo Done. copy %BUILD_DIR%\FV\EfiLdr %EFI_BOOT_DISK% mkdir %EFI_BOOT_DISK%\efi\boot -copy %WORKSPACE%\EdkShellBinPkg\bin\ia32\Shell.efi %EFI_BOOT_DISK%\efi\boot\bootia32.efi /y +copy %WORKSPACE%\EdkShellBinPkg\MinimumShell\ia32\Shell.efi %EFI_BOOT_DISK%\efi\boot\bootia32.efi /y @goto end :CreateFile @@ -42,9 +43,9 @@ copy %WORKSPACE%\EdkShellBinPkg\bin\ia32\Shell.efi %EFI_BOOT_DISK%\efi\boot\boot @echo Start to create file boot disk ... @echo Create boot sector ... %BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o FDBs.com -%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com %BUILD_DIR%\IA32\DuetPkg\BootSector\BootSector\OUTPUT\Bootsect.com -f +%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com %BOOTSECTOR_BIN_DIR%\Bootsect.com -f @REM @del FDBS.com -%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i %BUILD_DIR%\IA32\DuetPkg\BootSector\BootSector\OUTPUT\Bootsect.com +%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Bootsect.com @echo Done. @goto end @@ -62,9 +63,9 @@ copy %WORKSPACE%\EdkShellBinPkg\bin\ia32\Shell.efi %EFI_BOOT_DISK%\efi\boot\boot @del FormatCommandInput.txt @echo Create boot sector ... @%BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o UsbBs16.com -@%BASETOOLS_DIR%\Bootsectimage.exe -g UsbBs16.com %BUILD_DIR%\IA32\DuetPkg\BootSector\BootSector\OUTPUT\Bs16.com -f -@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i %BUILD_DIR%\IA32\DuetPkg\BootSector\BootSector\OUTPUT\Bs16.com -@%BASETOOLS_DIR%\Genbootsector.exe -m -o %EFI_BOOT_DISK% -i %BUILD_DIR%\IA32\DuetPkg\BootSector\BootSector\OUTPUT\Mbr.com +@%BASETOOLS_DIR%\Bootsectimage.exe -g UsbBs16.com %BOOTSECTOR_BIN_DIR%\Bs16.com -f +@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Bs16.com +@%BASETOOLS_DIR%\Genbootsector.exe -m -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Mbr.com @echo Done. @echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN! @goto end @@ -72,7 +73,7 @@ copy %WORKSPACE%\EdkShellBinPkg\bin\ia32\Shell.efi %EFI_BOOT_DISK%\efi\boot\boot :CreateUsb_FAT16_step2 @copy %BUILD_DIR%\FV\EfiLdr16 %EFI_BOOT_DISK% @mkdir %EFI_BOOT_DISK%\efi\boot -@copy %WORKSPACE%\EdkShellBinPkg\bin\ia32\Shell.efi %EFI_BOOT_DISK%\efi\boot\bootia32.efi /y +copy %WORKSPACE%\EdkShellBinPkg\MinimumShell\Ia32\Shell.efi %EFI_BOOT_DISK%\efi\boot\bootia32.efi /y @goto end :CreateUsb_FAT32 @@ -83,10 +84,10 @@ copy %WORKSPACE%\EdkShellBinPkg\bin\ia32\Shell.efi %EFI_BOOT_DISK%\efi\boot\boot @del FormatCommandInput.txt @echo Create boot sector ... @%BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o UsbBs32.com -@%BASETOOLS_DIR%\Bootsectimage.exe -g UsbBs32.com %BUILD_DIR%\IA32\DuetPkg\BootSector\BootSector\OUTPUT\Bs32.com -f +@%BASETOOLS_DIR%\Bootsectimage.exe -g UsbBs32.com %BOOTSECTOR_BIN_DIR%\Bs32.com -f @del UsbBs32.com -@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i %BUILD_DIR%\IA32\DuetPkg\BootSector\BootSector\OUTPUT\Bs32.com -@%BASETOOLS_DIR%\Genbootsector.exe -m -o %EFI_BOOT_DISK% -i %BUILD_DIR%\IA32\DuetPkg\BootSector\BootSector\OUTPUT\Mbr.com +@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Bs32.com +@%BASETOOLS_DIR%\Genbootsector.exe -m -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Mbr.com @echo Done. @echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN! @goto end @@ -94,7 +95,7 @@ copy %WORKSPACE%\EdkShellBinPkg\bin\ia32\Shell.efi %EFI_BOOT_DISK%\efi\boot\boot :CreateUsb_FAT32_step2 @copy %BUILD_DIR%\FV\EfiLdr20 %EFI_BOOT_DISK% @mkdir %EFI_BOOT_DISK%\efi\boot -@copy %WORKSPACE%\EdkShellBinPkg\bin\ia32\Shell.efi %EFI_BOOT_DISK%\efi\boot\bootia32.efi /y +@copy %WORKSPACE%\EdkShellBinPkg\MinimumShell\ia32\Shell.efi %EFI_BOOT_DISK%\efi\boot\bootia32.efi /y @goto end :CreateIde diff --git a/DuetPkg/CreateBootDisk.sh b/DuetPkg/CreateBootDisk.sh index 69c66f3357..fb54a31b0d 100644 --- a/DuetPkg/CreateBootDisk.sh +++ b/DuetPkg/CreateBootDisk.sh @@ -3,6 +3,7 @@ # Set up environment at fisrt. export BUILD_DIR=$WORKSPACE/Build/DuetPkg/DEBUG_UNIXGCC export BASETOOLS_DIR=$WORKSPACE/Conf/BaseToolsSource/Source/C/bin +export BOOTSECTOR_BIN_DIR=$WORKSPACE/DuetPkg/BootSector/bin export DISK_LABEL=DUET export PROCESS_MARK=TRUE @@ -36,15 +37,15 @@ then echo Create boot sector ... ## Linux version of GenBootSector has not pass build yet. $BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_DEVICE -o FDBs.com - $BASETOOLS_DIR/BootSectImage -g FDBs.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/bootsect.com -f - $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/bootsect.com + $BASETOOLS_DIR/BootSectImage -g FDBs.com $BOOTSECTOR_BIN_DIR/bootsect.com -f + $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/bootsect.com cp $BUILD_DIR/FV/Efildr $EFI_BOOT_MEDIA mkdir -p $EFI_BOOT_MEDIA/efi mkdir -p $EFI_BOOT_MEDIA/efi/boot - cp $WORKSPACE/EdkShellBinPkg/Bin/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi + cp $WORKSPACE/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi echo Done. else @@ -60,8 +61,8 @@ then ## Linux version of GenBootSector has not pass build yet. $BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_MEDIA -o FDBs.com - $BASETOOLS_DIR/BootSectImage -g FDBs.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bootsect.com -f - $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_MEDIA -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bootsect.com + $BASETOOLS_DIR/BootSectImage -g FDBs.com $BOOTSECTOR_BIN_DIR/bootsect.com -f + $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_MEDIA -i $BOOTSECTOR_BIN_DIR/bootsect.com echo Done. else echo "Wrong FAT type" $4 "for floppy!" @@ -76,7 +77,7 @@ then then cp $BUILD_DIR/FV/Efildr16 $EFI_BOOT_MEDIA mkdir $EFI_BOOT_MEDIA/efi/boot - cp $WORKSPACE/EdkShellBinPkg/bin/ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi + cp $WORKSPACE/EdkShellBinPkg/MinimumShell/ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi echo "step2 Done!" else echo Format $EFI_BOOT_DEVICE ... @@ -84,9 +85,9 @@ then echo Create boot sector ... ## Linux version of GenBootSector & Bootsectimage has not pass build yet. $BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_DEVICE -o UsbBs16.com - $BASETOOLS_DIR/BootSectImage -g UsbBs16.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs16.com -f - $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs16.com - $BASETOOLS_DIR/GnuGenBootSector -m -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Mbr.com + $BASETOOLS_DIR/BootSectImage -g UsbBs16.com $BOOTSECTOR_BIN_DIR/bs16.com -f + $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/bs16.com + $BASETOOLS_DIR/GnuGenBootSector -m -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/Mbr.com echo Done. echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN TO DO STEP2! fi @@ -96,7 +97,7 @@ then then cp $BUILD_DIR/FV/Efildr20 $EFI_BOOT_MEDIA mkdir $EFI_BOOT_MEDIA/efi/boot - cp $WORKSPACE/EdkShellBinPkg/bin/ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi + cp $WORKSPACE/EdkShellBinPkg/MinimumShell/ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi echo "step2 Done!" else echo Format $EFI_BOOT_DEVICE ... @@ -104,9 +105,9 @@ then echo Create boot sector ... ## Linux version of GenBootSector & Bootsectimage has not pass build yet. $BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_DEVICE -o UsbBs32.com - $BASETOOLS_DIR/BootSectImage -g UsbBs32.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs32.com -f - $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs32.com - $BASETOOLS_DIR/GnuGenBootSector -m -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Mbr.com + $BASETOOLS_DIR/BootSectImage -g UsbBs32.com $BOOTSECTOR_BIN_DIR/bs32.com -f + $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/bs32.com + $BASETOOLS_DIR/GnuGenBootSector -m -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/Mbr.com echo Done. echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN TO DO STEP2! fi diff --git a/DuetPkg/DuetPkg.dsc b/DuetPkg/DuetPkg.dsc index 08b40b74ff..45f99cfb41 100644 --- a/DuetPkg/DuetPkg.dsc +++ b/DuetPkg/DuetPkg.dsc @@ -184,9 +184,6 @@ # Sample Application # MdeModulePkg/Application/HelloWorld/HelloWorld.inf - -[Components.IA32] - DuetPkg/BootSector/BootSector.inf [BuildOptions.common] MSFT:*_*_*_CC_FLAGS = /FAsc /FR$(@R).SBR diff --git a/DuetPkg/PostBuild.bat b/DuetPkg/PostBuild.bat index 8ed7943e29..43f7de9464 100644 --- a/DuetPkg/PostBuild.bat +++ b/DuetPkg/PostBuild.bat @@ -6,6 +6,7 @@ @set BUILD_DIR=%WORKSPACE%\Build\DuetPkg\DEBUG_MYTOOLS @set BASETOOLS_DIR=%WORKSPACE_TOOLS_PATH%\Bin\Win32 +@set BOOTSECTOR_BIN_DIR=%WORKSPACE%\DuetPkg\BootSector\bin @set PROCESSOR="" @if "%1"=="" goto NoArch @@ -13,9 +14,6 @@ @if "%1"=="X64" set PROCESSOR=X64 @if %PROCESSOR%=="" goto WrongArch -@set OUTPUT_DIR=%BUILD_DIR%\%PROCESSOR%\DuetPkg\BootSector\BootSector\OUTPUT -@set BOOTSECTOR_OUTPUT_DIR=%BUILD_DIR%\IA32\DuetPkg\BootSector\BootSector\OUTPUT - @echo Compressing DUETEFIMainFv.FV ... @%BASETOOLS_DIR%\LzmaCompress -e -o %BUILD_DIR%\FV\DUETEFIMAINFV.z %BUILD_DIR%\FV\DUETEFIMAINFV.Fv @@ -31,18 +29,18 @@ :GENERATE_IMAGE_IA32 @%BASETOOLS_DIR%\EfiLdrImage.exe -o %BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\%PROCESSOR%\EfiLoader.efi %BUILD_DIR%\FV\DxeIpl.z %BUILD_DIR%\FV\DxeMain.z %BUILD_DIR%\FV\DUETEFIMAINFV.z -@copy /b %OUTPUT_DIR%\Start.com+%OUTPUT_DIR%\Efi32.com2+%BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\FV\Efildr -@copy /b %OUTPUT_DIR%\Start16.com+%OUTPUT_DIR%\Efi32.com2+%BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\FV\Efildr16 -@copy /b %OUTPUT_DIR%\Start32.com+%OUTPUT_DIR%\Efi32.com2+%BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\FV\Efildr20 +@copy /b %BOOTSECTOR_BIN_DIR%\Start.com+%BOOTSECTOR_BIN_DIR%\Efi32.com2+%BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\FV\Efildr +@copy /b %BOOTSECTOR_BIN_DIR%\Start16.com+%BOOTSECTOR_BIN_DIR%\Efi32.com2+%BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\FV\Efildr16 +@copy /b %BOOTSECTOR_BIN_DIR%\Start32.com+%BOOTSECTOR_BIN_DIR%\Efi32.com2+%BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\FV\Efildr20 @goto end :GENERATE_IMAGE_X64 @%BASETOOLS_DIR%\EfiLdrImage.exe -o %BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\%PROCESSOR%\EfiLoader.efi %BUILD_DIR%\FV\DxeIpl.z %BUILD_DIR%\FV\DxeMain.z %BUILD_DIR%\FV\DUETEFIMAINFV.z -@copy /b %BOOTSECTOR_OUTPUT_DIR%\Start64.com+%BOOTSECTOR_OUTPUT_DIR%\Efi64.com2+%BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\FV\EfildrPure +@copy /b %BOOTSECTOR_BIN_DIR%\Start64.com+%BOOTSECTOR_BIN_DIR%\Efi64.com2+%BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\FV\EfildrPure @%BASETOOLS_DIR%\GenPage.exe %BUILD_DIR%\FV\EfildrPure -o %BUILD_DIR%\FV\Efildr -@copy /b %BOOTSECTOR_OUTPUT_DIR%\St16_64.com+%BOOTSECTOR_OUTPUT_DIR%\Efi64.com2+%BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\FV\Efildr16Pure +@copy /b %BOOTSECTOR_BIN_DIR%\St16_64.com+%BOOTSECTOR_BIN_DIR%\Efi64.com2+%BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\FV\Efildr16Pure @%BASETOOLS_DIR%\GenPage.exe %BUILD_DIR%\FV\Efildr16Pure -o %BUILD_DIR%\FV\Efildr16 -@copy /b %BOOTSECTOR_OUTPUT_DIR%\St32_64.com+%BOOTSECTOR_OUTPUT_DIR%\Efi64.com2+%BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\FV\Efildr20Pure +@copy /b %BOOTSECTOR_BIN_DIR%\St32_64.com+%BOOTSECTOR_BIN_DIR%\Efi64.com2+%BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\FV\Efildr20Pure @%BASETOOLS_DIR%\GenPage.exe %BUILD_DIR%\FV\Efildr20Pure -o %BUILD_DIR%\FV\Efildr20 @goto end diff --git a/DuetPkg/PostBuild.sh b/DuetPkg/PostBuild.sh index 024e32c791..eebfcfae43 100644 --- a/DuetPkg/PostBuild.sh +++ b/DuetPkg/PostBuild.sh @@ -8,6 +8,7 @@ export BUILD_DIR=$WORKSPACE/Build/DuetPkg/DEBUG_UNIXGCC export BASETOOLS_DIR=$WORKSPACE/Conf/BaseToolsSource/Source/C/bin +export BOOTSECTOR_BIN_DIR=$WORKSPACE/DuetPkg/BootSector/bin export PROCESSOR="" if [ \ -z "$1" -o \ @@ -35,7 +36,6 @@ esac # # Boot sector module could only be built under IA32 tool chain # -export OUTPUT_DIR=$BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT echo Compressing DUETEFIMainFv.FV ... $BASETOOLS_DIR/LzmaCompress -e -o $BUILD_DIR/FV/DUETEFIMAINFV.z $BUILD_DIR/FV/DUETEFIMAINFV.Fv @@ -51,29 +51,29 @@ echo Generate Loader Image ... if [ $PROCESSOR = IA32 ] then $BASETOOLS_DIR/EfiLdrImage -o $BUILD_DIR/FV/Efildr32 $BUILD_DIR/$PROCESSOR/EfiLoader.efi $BUILD_DIR/FV/DxeIpl.z $BUILD_DIR/FV/DxeMain.z $BUILD_DIR/FV/DUETEFIMAINFV.z - cat $OUTPUT_DIR/start.com $OUTPUT_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 > $BUILD_DIR/FV/Efildr + cat $BOOTSECTOR_BIN_DIR/start.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 > $BUILD_DIR/FV/Efildr # # It is safe to use "bcat" to cat following binary file, if bcat command is avaiable for your system # - #bcat -o $BUILD_DIR/FV/Efildr.bcat $OUTPUT_DIR/start.com $OUTPUT_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 - cat $OUTPUT_DIR/start16.com $OUTPUT_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 > $BUILD_DIR/FV/Efildr16 - #bcat -o $BUILD_DIR/FV/Efildr16.bcat $OUTPUT_DIR/start16.com $OUTPUT_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 - cat $OUTPUT_DIR/start32.com $OUTPUT_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 > $BUILD_DIR/FV/Efildr20 - #bcat -o $BUILD_DIR/FV/Efildr20.bcat $OUTPUT_DIR/start32.com $OUTPUT_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 + #bcat -o $BUILD_DIR/FV/Efildr.bcat $BOOTSECTOR_BIN_DIR/start.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 + cat $BOOTSECTOR_BIN_DIR/start16.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 > $BUILD_DIR/FV/Efildr16 + #bcat -o $BUILD_DIR/FV/Efildr16.bcat $BOOTSECTOR_BIN_DIR/start16.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 + cat $BOOTSECTOR_BIN_DIR/start32.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 > $BUILD_DIR/FV/Efildr20 + #bcat -o $BUILD_DIR/FV/Efildr20.bcat $BOOTSECTOR_BIN_DIR/start32.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 echo Done! fi if [ $PROCESSOR = X64 ] then $BASETOOLS_DIR/EfiLdrImage -o $BUILD_DIR/FV/Efildr64 $BUILD_DIR/$PROCESSOR/EfiLoader.efi $BUILD_DIR/FV/DxeIpl.z $BUILD_DIR/FV/DxeMain.z $BUILD_DIR/FV/DUETEFIMAINFV.z - cat $OUTPUT_DIR/start64.com $OUTPUT_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 > $BUILD_DIR/FV/EfildrPure - #bcat -o $BUILD_DIR/FV/EfildrPure $OUTPUT_DIR/start64.com $OUTPUT_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 + cat $BOOTSECTOR_BIN_DIR/start64.com $BOOTSECTOR_BIN_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 > $BUILD_DIR/FV/EfildrPure + #bcat -o $BUILD_DIR/FV/EfildrPure $BOOTSECTOR_BIN_DIR/start64.com $BOOTSECTOR_BIN_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 $BASETOOLS_DIR/GenPage $BUILD_DIR/FV/EfildrPure -o $BUILD_DIR/FV/Efildr - cat $OUTPUT_DIR/st16_64.com $OUTPUT_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 > $BUILD_DIR/FV/Efildr16Pure - #bcat -o $BUILD_DIR/FV/Efildr16Pure $OUTPUT_DIR/st16_64.com $OUTPUT_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 + cat $BOOTSECTOR_BIN_DIR/st16_64.com $BOOTSECTOR_BIN_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 > $BUILD_DIR/FV/Efildr16Pure + #bcat -o $BUILD_DIR/FV/Efildr16Pure $BOOTSECTOR_BIN_DIR/st16_64.com $BOOTSECTOR_BIN_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 $BASETOOLS_DIR/GenPage $BUILD_DIR/FV/Efildr16Pure -o $BUILD_DIR/FV/Efildr16 - cat $OUTPUT_DIR/st32_64.com $OUTPUT_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 > $BUILD_DIR/FV/Efildr20Pure - #bcat -o $BUILD_DIR/FV/Efildr20Pure $OUTPUT_DIR/st32_64.com $OUTPUT_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 + cat $BOOTSECTOR_BIN_DIR/st32_64.com $BOOTSECTOR_BIN_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 > $BUILD_DIR/FV/Efildr20Pure + #bcat -o $BUILD_DIR/FV/Efildr20Pure $BOOTSECTOR_BIN_DIR/st32_64.com $BOOTSECTOR_BIN_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 $BASETOOLS_DIR/GenPage $BUILD_DIR/FV/Efildr20Pure -o $BUILD_DIR/FV/Efildr20 echo Done! -- 2.39.2